diff --git a/include/boost/mpl/max.hpp b/core/include/boost/mpl/max.hpp
similarity index 100%
rename from include/boost/mpl/max.hpp
rename to core/include/boost/mpl/max.hpp
diff --git a/include/boost/mpl/min.hpp b/core/include/boost/mpl/min.hpp
similarity index 100%
rename from include/boost/mpl/min.hpp
rename to core/include/boost/mpl/min.hpp
diff --git a/include/boost/mpl/min_max.hpp b/core/include/boost/mpl/min_max.hpp
similarity index 100%
rename from include/boost/mpl/min_max.hpp
rename to core/include/boost/mpl/min_max.hpp
diff --git a/core/test/Jamfile.v2 b/core/test/Jamfile.v2
index 677d90b..19410a4 100644
--- a/core/test/Jamfile.v2
+++ b/core/test/Jamfile.v2
@@ -26,6 +26,7 @@ run int.cpp ;
 run char.cpp ;
 run integral_c.cpp : : : <toolset>vacpp:<cxxflags>-qchars=signed ;
 compile logical.cpp ;
+compile min_max.cpp ;
 compile no_has_xxx.cpp ;
 compile numeric_ops.cpp ;
 run print.cpp ;
diff --git a/test/min_max.cpp b/core/test/min_max.cpp
similarity index 100%
rename from test/min_max.cpp
rename to core/test/min_max.cpp
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index d8d8b1d..57ed04b 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -56,7 +56,6 @@ compile list_c.cpp ;
 compile lower_bound.cpp ;
 compile map.cpp ;
 compile max_element.cpp ;
-compile min_max.cpp ;
 compile multiset.cpp ;
 compile next.cpp ;
 compile pair_view.cpp ;