diff --git a/src/core/mpi/MPIManager.cpp b/src/core/mpi/MPIManager.cpp
index fe89748d401a00488e7081043643dbac16986709..f8944ab781e8c7c7a587e1a7a484eca30cb1950f 100644
--- a/src/core/mpi/MPIManager.cpp
+++ b/src/core/mpi/MPIManager.cpp
@@ -24,7 +24,6 @@
 #include "MPIManager.h"
 #include "core/logging/Logging.h"
 
-#include <boost/exception_ptr.hpp>
 #include <exception>
 #include <iostream>
 #include <stdexcept>
@@ -57,8 +56,8 @@ static void customTerminateHandler()
    // i.e. in cases when this hack does not work, we just cannot print the message
    // otherwise we re-throw the exception to get the type, and print exception.what()
    try {
-      if(boost::current_exception() )
-         boost::rethrow_exception(boost::current_exception());
+      if(std::current_exception() )
+         std::rethrow_exception(std::current_exception());
    } catch (std::exception const & exc) {
       std::cerr << exc.what() << std::endl;
    }
diff --git a/src/python_coupling/CreateConfig.cpp b/src/python_coupling/CreateConfig.cpp
index 2e1ed583def4c32aa1625deae7aa481ee1eef3f9..61054f4f1492450bce962000650280ac931e5156 100644
--- a/src/python_coupling/CreateConfig.cpp
+++ b/src/python_coupling/CreateConfig.cpp
@@ -27,7 +27,6 @@
 #include "core/logging/Logging.h"
 
 #include <boost/algorithm/string.hpp>
-#include <boost/exception/all.hpp>
 #include <exception>