diff --git a/Kinetic_space_partition/include/CGAL/KSP/utils.h b/Kinetic_space_partition/include/CGAL/KSP/utils.h
index d8e99ddddc28..64a2d9972965 100644
--- a/Kinetic_space_partition/include/CGAL/KSP/utils.h
+++ b/Kinetic_space_partition/include/CGAL/KSP/utils.h
@@ -41,7 +41,6 @@
 #include <CGAL/linear_least_squares_fitting_2.h>
 #include <CGAL/linear_least_squares_fitting_3.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Polygon_2_algorithms.h>
 
 // Boost includes.
 #include <boost/iterator/function_output_iterator.hpp>
diff --git a/Kinetic_space_partition/include/CGAL/KSP_3/Initializer.h b/Kinetic_space_partition/include/CGAL/KSP_3/Initializer.h
index be34da2cb05e..74b29a5d4611 100644
--- a/Kinetic_space_partition/include/CGAL/KSP_3/Initializer.h
+++ b/Kinetic_space_partition/include/CGAL/KSP_3/Initializer.h
@@ -17,14 +17,14 @@
 
 // CGAL includes.
 #include <CGAL/Timer.h>
-#include <CGAL/optimal_bounding_box.h>
-#include <CGAL/Boolean_set_operations_2.h>
+//#include <CGAL/optimal_bounding_box.h>
+//#include <CGAL/Boolean_set_operations_2.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/intersections.h>
 #include <CGAL/min_quadrilateral_2.h>
-#include <CGAL/Aff_transformation_2.h>
-#include <boost/optional/optional_io.hpp>
+//#include <CGAL/Aff_transformation_2.h>
+//#include <boost/optional/optional_io.hpp>
 
 // Internal includes.
 #include <CGAL/KSP/utils.h>
@@ -74,7 +74,7 @@ class Initializer {
   using From_exact = CGAL::Cartesian_converter<Intersection_kernel, Kernel>;
 
   using Bbox_3 = CGAL::Bbox_3;
-  using OBB_traits = CGAL::Oriented_bounding_box_traits_3<Kernel>;
+  //using OBB_traits = CGAL::Oriented_bounding_box_traits_3<Kernel>;
 
   using Parameters = KSP::internal::Parameters_3<FT>;
 
diff --git a/Kinetic_space_partition/package_info/Kinetic_space_partition/dependencies b/Kinetic_space_partition/package_info/Kinetic_space_partition/dependencies
index 737b0d92b95e..831b16749e83 100644
--- a/Kinetic_space_partition/package_info/Kinetic_space_partition/dependencies
+++ b/Kinetic_space_partition/package_info/Kinetic_space_partition/dependencies
@@ -1,20 +1,16 @@
 Algebraic_foundations
 Arithmetic_kernel
-Arrangement_on_surface_2
 BGL
-Boolean_set_operations_2
 Bounding_volumes
 CGAL_Core
 Cartesian_kernel
 Circulator
 Combinatorial_map
 Convex_hull_2
-Convex_hull_3
 Distance_2
 Distance_3
 Filtered_kernel
 Generalized_map
-HalfedgeDS
 Hash_map
 Homogeneous_kernel
 Installation
@@ -27,7 +23,6 @@ Kinetic_space_partition
 Linear_cell_complex
 Modular_arithmetic
 Number_types
-Optimal_bounding_box
 Orthtree
 Point_set_3
 Point_set_processing_3
@@ -43,7 +38,5 @@ Solver_interface
 Spatial_sorting
 Stream_support
 Surface_mesh
-Surface_sweep_2
 TDS_2
 Triangulation_2
-Union_find
diff --git a/Kinetic_surface_reconstruction/package_info/Kinetic_surface_reconstruction/dependencies b/Kinetic_surface_reconstruction/package_info/Kinetic_surface_reconstruction/dependencies
index 50beb4822f2a..485a6ca615ef 100644
--- a/Kinetic_surface_reconstruction/package_info/Kinetic_surface_reconstruction/dependencies
+++ b/Kinetic_surface_reconstruction/package_info/Kinetic_surface_reconstruction/dependencies
@@ -1,20 +1,16 @@
 Algebraic_foundations
 Arithmetic_kernel
-Arrangement_on_surface_2
 BGL
-Boolean_set_operations_2
 Bounding_volumes
 Cartesian_kernel
 CGAL_Core
 Circulator
 Combinatorial_map
 Convex_hull_2
-Convex_hull_3
 Distance_2
 Distance_3
 Filtered_kernel
 Generalized_map
-HalfedgeDS
 Hash_map
 Homogeneous_kernel
 Installation
@@ -28,7 +24,6 @@ Kinetic_surface_reconstruction
 Linear_cell_complex
 Modular_arithmetic
 Number_types
-Optimal_bounding_box
 Orthtree
 Point_set_3
 Point_set_processing_3
@@ -48,9 +43,7 @@ Spatial_sorting
 Stream_support
 Surface_mesh
 Surface_mesh_segmentation
-Surface_sweep_2
 TDS_2
 TDS_3
 Triangulation_2
 Triangulation_3
-Union_find