diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
index 438e7ce0598..c8fbdc93570 100644
--- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
@@ -32,11 +32,24 @@
 #include <climits>
 #include <math.h>
 
+#if defined(BOOST_MSVC)
+#  pragma warning(push)
+#  pragma warning(disable:4172) // Address warning inside boost named parameters
+#endif
+
 #include <CGAL/property_map.h>
 #include <boost/graph/adjacency_list.hpp>
-#include <CGAL/boost/graph/dijkstra_shortest_paths.h> // work around a bug in boost 1.54
+#include <CGAL/boost/graph/dijkstra_shortest_paths.h> // work around a
+                                                      // bug in boost
+                                                      // 1.54
+
+
 #include <boost/graph/prim_minimum_spanning_tree.hpp>
 
+#if defined(BOOST_MSVC)
+#  pragma warning(pop)
+#endif
+
 namespace CGAL {