diff --git a/Arithmetic_kernel/include/CGAL/BOOST_MP_arithmetic_kernel.h b/Arithmetic_kernel/include/CGAL/BOOST_MP_arithmetic_kernel.h
index 330638931eb..6cc5545c6ce 100644
--- a/Arithmetic_kernel/include/CGAL/BOOST_MP_arithmetic_kernel.h
+++ b/Arithmetic_kernel/include/CGAL/BOOST_MP_arithmetic_kernel.h
@@ -28,11 +28,11 @@
 
 #ifdef CGAL_USE_BOOST_MP
 
-#include <boost/multiprecision/cpp_int.hpp>
-#ifdef CGAL_USE_GMP
-#include <CGAL/gmp.h>
-#include <boost/multiprecision/gmp.hpp>
-#endif
+//Currently already included in boost_mp.h
+//#include <boost/multiprecision/cpp_int.hpp>
+//#ifdef CGAL_USE_GMP
+//#include <boost/multiprecision/gmp.hpp>
+//#endif
 
 // FIXME: the could be several kernels based on Boost.Multiprecision.
 
diff --git a/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp b/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
index 8d39410d73e..22ea86ccecd 100644
--- a/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
+++ b/QP_solver/test/QP_solver/master_mps_to_derivatives.cpp
@@ -41,14 +41,15 @@
 #include <CGAL/QP_models.h>
 #include <CGAL/QP_functions.h>
 
-#ifdef CGAL_USE_BOOST_MP
-# include <boost/multiprecision/cpp_int.hpp>
-// After some CGAL includes so we get a chance to define CGAL_USE_GMP.
-# ifdef CGAL_USE_GMP
-#  include <CGAL/gmp.h>
-#  include <boost/multiprecision/gmp.hpp>
-# endif
-#endif
+#include <CGAL/boost_mp.h>
+//Currently already included in boost_mp.h
+//#ifdef CGAL_USE_BOOST_MP
+//# include <boost/multiprecision/cpp_int.hpp>
+//// After some CGAL includes so we get a chance to define CGAL_USE_GMP.
+//# ifdef CGAL_USE_GMP
+//#  include <boost/multiprecision/gmp.hpp>
+//# endif
+//#endif
 
 // Routines to output to MPS format:
 namespace QP_from_mps_detail {