diff --git a/Documentation/doc/Documentation/packages.txt b/Documentation/doc/Documentation/packages.txt
index 7fd9f160adb..eaefdfcf0f6 100644
--- a/Documentation/doc/Documentation/packages.txt
+++ b/Documentation/doc/Documentation/packages.txt
@@ -134,7 +134,6 @@
 \package_listing{AABB_tree}
 \package_listing{Orthtree}
 \package_listing{Spatial_sorting}
-\package_listing{Optimal_bounding_box}
 
 \cgalPackageSection{PartGeometricOptimization,Geometric Optimization}
 
@@ -142,6 +141,7 @@
 \package_listing{Inscribed_areas}
 \package_listing{Polytope_distance_d}
 \package_listing{Principal_component_analysis}
+\package_listing{Optimal_bounding_box}
 
 \cgalPackageSection{PartInterpolation,Interpolation}
 
diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h
index d8497ba486a..12b37586a41 100644
--- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h
+++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/internal/optimize_2.h
@@ -14,10 +14,10 @@
 
 #include <CGAL/license/Optimal_bounding_box.h>
 
+#include <CGAL/assertions.h>
 #include <CGAL/ch_akl_toussaint.h>
 #include <CGAL/min_quadrilateral_2.h>
 #include <CGAL/Polygon_2.h>
-#include <CGAL/number_type_config.h>
 
 #include <iostream>
 #include <iterator>
diff --git a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
index 1fdbebbd16f..1433ed2fb9f 100644
--- a/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
+++ b/Optimal_bounding_box/include/CGAL/Optimal_bounding_box/oriented_bounding_box.h
@@ -19,19 +19,16 @@
 #include <CGAL/Optimal_bounding_box/internal/population.h>
 #include <CGAL/Optimal_bounding_box/Oriented_bounding_box_traits_3.h>
 
-#include <CGAL/boost/graph/Named_function_parameters.h>
-#include <CGAL/boost/graph/named_params_helper.h>
-
+#include <CGAL/Aff_transformation_3.h>
 #include <CGAL/assertions.h>
 #include <CGAL/boost/graph/helpers.h>
+#include <CGAL/boost/graph/Named_function_parameters.h>
+#include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/convex_hull_3.h>
 #include <CGAL/Convex_hull_traits_3.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Iso_cuboid_3.h>
 #include <CGAL/Iterator_range.h>
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/Random.h>
-#include <CGAL/Simple_cartesian.h>
 
 #ifdef CGAL_OPTIMAL_BOUNDING_BOX_BENCHMARKS
 #include <CGAL/Real_timer.h>
diff --git a/Optimal_bounding_box/package_info/Optimal_bounding_box/dependencies b/Optimal_bounding_box/package_info/Optimal_bounding_box/dependencies
index 2939f3c62fa..4ba805152f7 100644
--- a/Optimal_bounding_box/package_info/Optimal_bounding_box/dependencies
+++ b/Optimal_bounding_box/package_info/Optimal_bounding_box/dependencies
@@ -10,13 +10,11 @@ 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
 Optimal_bounding_box