diff --git a/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies b/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies
index d6667a72a3d..6a453cfa1e9 100644
--- a/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies
+++ b/Alpha_shapes_3/package_info/Alpha_shapes_3/dependencies
@@ -4,7 +4,6 @@ Arithmetic_kernel
 Cartesian_kernel
 Circulator
 Filtered_kernel
-Geomview
 Hash_map
 Homogeneous_kernel
 Installation
diff --git a/BGL/package_info/BGL/dependencies b/BGL/package_info/BGL/dependencies
index ebc36eadd85..7cf027b2c48 100644
--- a/BGL/package_info/BGL/dependencies
+++ b/BGL/package_info/BGL/dependencies
@@ -1,19 +1,13 @@
 Algebraic_foundations
-Arithmetic_kernel
 BGL
 Cartesian_kernel
 Circulator
 Distance_2
 Distance_3
-Filtered_kernel
 Hash_map
-Homogeneous_kernel
 Installation
-Intersections_2
-Intersections_3
 Interval_support
 Kernel_23
-Kernel_d
 Modular_arithmetic
 Number_types
 Profiling_tools
diff --git a/Geomview/package_info/Geomview/dependencies b/Geomview/package_info/Geomview/dependencies
index 7c8f7ab1d75..1598b3438f7 100644
--- a/Geomview/package_info/Geomview/dependencies
+++ b/Geomview/package_info/Geomview/dependencies
@@ -1,6 +1,4 @@
 Algebraic_foundations
-Circulator
-Geomview
 Installation
 Interval_support
 Kernel_23
diff --git a/Installation/cmake/modules/list_of_whitelisted_headers.cmake b/Installation/cmake/modules/list_of_whitelisted_headers.cmake
index 28e88573927..cf653a08abf 100644
--- a/Installation/cmake/modules/list_of_whitelisted_headers.cmake
+++ b/Installation/cmake/modules/list_of_whitelisted_headers.cmake
@@ -1,9 +1,6 @@
 set(list_of_whitelisted_headers_txt [=[
   CGAL/SCIP_mixed_integer_program_traits.h
   CGAL/GLPK_mixed_integer_program_traits.h
-  CGAL/boost/graph/partition.h
-  CGAL/boost/graph/METIS/partition_dual_graph.h
-  CGAL/boost/graph/METIS/partition_graph.h
   CGAL/Classification/TensorFlow/Neural_network_classifier.h
   CGAL/Linear_cell_complex_constructors.h
   CGAL/CGAL_Ipelet_base.h
@@ -34,6 +31,17 @@ set(list_of_whitelisted_headers_txt [=[
   CGAL/Three/Viewer_config.h
   CGAL/Three/Viewer_interface.h
   CGAL/Three/Three.h
+  CGAL/boost/graph/properties_OpenMesh.h
+  CGAL/boost/graph/properties_TriMesh_ArrayKernelT.h
+  CGAL/boost/graph/properties_PolyMesh_ArrayKernelT.h
+  CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h
+  CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h
+  CGAL/boost/graph/partition.h
+  CGAL/boost/graph/METIS/partition_dual_graph.h
+  CGAL/boost/graph/METIS/partition_graph.h
+  CGAL/IO/Triangulation_geomview_ostream_3.h
+  CGAL/IO/Triangulation_geomview_ostream_2.h
+  CGAL/IO/Polyhedron_geomview_ostream.h
 
 ]=])
 
diff --git a/Installation/include/CGAL/config.h b/Installation/include/CGAL/config.h
index c15f7841a98..8f0f43c95a9 100644
--- a/Installation/include/CGAL/config.h
+++ b/Installation/include/CGAL/config.h
@@ -465,9 +465,9 @@ using std::max;
 
 //-------------------------------------------------------------------//
 // Is Geomview usable ?
-#if !defined(_MSC_VER) && !defined(__MINGW32__)
-#  define CGAL_USE_GEOMVIEW
-#endif
+//#if !defined(_MSC_VER) && !defined(__MINGW32__)
+//#  define CGAL_USE_GEOMVIEW
+//#endif
 
 
 //-------------------------------------------------------------------//
diff --git a/Polyhedron_IO/package_info/Polyhedron_IO/dependencies b/Polyhedron_IO/package_info/Polyhedron_IO/dependencies
index b8678f37e1c..49dc8dde8a0 100644
--- a/Polyhedron_IO/package_info/Polyhedron_IO/dependencies
+++ b/Polyhedron_IO/package_info/Polyhedron_IO/dependencies
@@ -2,7 +2,6 @@ Algebraic_foundations
 BGL
 Circulator
 Distance_2
-Geomview
 HalfedgeDS
 Hash_map
 Installation
diff --git a/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies b/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies
index 905e54313c1..4164cb98796 100644
--- a/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies
+++ b/Scale_space_reconstruction_3/package_info/Scale_space_reconstruction_3/dependencies
@@ -8,7 +8,6 @@ Circulator
 Distance_2
 Distance_3
 Filtered_kernel
-Geomview
 HalfedgeDS
 Hash_map
 Homogeneous_kernel
diff --git a/Triangulation_2/package_info/Triangulation_2/dependencies b/Triangulation_2/package_info/Triangulation_2/dependencies
index 90dd0267b28..c8d90b721ca 100644
--- a/Triangulation_2/package_info/Triangulation_2/dependencies
+++ b/Triangulation_2/package_info/Triangulation_2/dependencies
@@ -6,7 +6,6 @@ Circulator
 Distance_2
 Distance_3
 Filtered_kernel
-Geomview
 GraphicsView
 Hash_map
 Homogeneous_kernel
diff --git a/Triangulation_3/package_info/Triangulation_3/dependencies b/Triangulation_3/package_info/Triangulation_3/dependencies
index e22da1bafd7..53da26a4122 100644
--- a/Triangulation_3/package_info/Triangulation_3/dependencies
+++ b/Triangulation_3/package_info/Triangulation_3/dependencies
@@ -6,7 +6,6 @@ Circulator
 Distance_2
 Distance_3
 Filtered_kernel
-Geomview
 GraphicsView
 Hash_map
 Homogeneous_kernel