diff --git a/include/pmacc/cuSTL/algorithm/kernel/run-time/Foreach.hpp b/include/pmacc/cuSTL/algorithm/kernel/run-time/Foreach.hpp
index d5656a9f5f..a62014b930 100644
--- a/include/pmacc/cuSTL/algorithm/kernel/run-time/Foreach.hpp
+++ b/include/pmacc/cuSTL/algorithm/kernel/run-time/Foreach.hpp
@@ -37,7 +37,11 @@
 #include <boost/preprocessor/arithmetic/inc.hpp>
 #include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/repetition/repeat_from_to.hpp>
-#include <boost/math/common_factor_rt.hpp>
+#if( BOOST_VERSION < 106700 )
+#   include <boost/math/common_factor_rt.hpp>
+#else
+#   include <boost/integer/common_factor_rt.hpp>
+#endif
 
 #include "pmacc/eventSystem/tasks/TaskKernel.hpp"
 #include "pmacc/eventSystem/events/kernelEvents.hpp"
diff --git a/include/pmacc/cuSTL/container/assigner/DeviceMemAssigner.hpp b/include/pmacc/cuSTL/container/assigner/DeviceMemAssigner.hpp
index c129094184..fd15822fa9 100644
--- a/include/pmacc/cuSTL/container/assigner/DeviceMemAssigner.hpp
+++ b/include/pmacc/cuSTL/container/assigner/DeviceMemAssigner.hpp
@@ -31,7 +31,11 @@
 
 #include <pmacc/cuSTL/algorithm/functor/AssignValue.hpp>
 
-#include <boost/math/common_factor_rt.hpp>
+#if( BOOST_VERSION < 106700 )
+#   include <boost/math/common_factor_rt.hpp>
+#else
+#   include <boost/integer/common_factor_rt.hpp>
+#endif
 #include <boost/mpl/placeholders.hpp>
 
 #include <stdint.h>