diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_parallel_union_meshes.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_parallel_union_meshes.cpp
index 72bd328a50d5..a8f3c2ea5ee2 100644
--- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_parallel_union_meshes.cpp
+++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/corefinement_parallel_union_meshes.cpp
@@ -10,6 +10,7 @@
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
 typedef Kernel::Point_3 Point_3;
+typedef Kernel::Aff_transformation_3 Aff_transformation_3;
 typedef CGAL::Surface_mesh<Point_3> Mesh;
 
 namespace PMP = CGAL::Polygon_mesh_processing;
@@ -23,7 +24,7 @@ int main(int argc, char** argv)
   in >> meshes[0];
   for (int i=1; i<nb_copies; ++i)
   {
-    CGAL::Aff_transformation_3<Kernel> trans(CGAL::Translation(),  Kernel::Vector_3(i*0.2, 0, 0));
+    Aff_transformation_3 trans(CGAL::Translation(),  Kernel::Vector_3(i*0.2, 0, 0));
     meshes[i]=meshes[0];
     PMP::transform(trans, meshes[i]);
   }
diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hausdorff_bounded_error_distance_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hausdorff_bounded_error_distance_example.cpp
index 44f1944be0b4..7fa0cbcd5407 100644
--- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/hausdorff_bounded_error_distance_example.cpp
+++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/hausdorff_bounded_error_distance_example.cpp
@@ -1,5 +1,4 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Aff_transformation_3.h>
 #include <CGAL/IO/OFF.h>
 
 #include <CGAL/Surface_mesh.h>
@@ -8,15 +7,15 @@
 #include <CGAL/Polygon_mesh_processing/distance.h>
 #include <CGAL/Polygon_mesh_processing/transform.h>
 
-using Kernel   = CGAL::Exact_predicates_inexact_constructions_kernel;
-using FT       = typename Kernel::FT;
-using Point_3  = typename Kernel::Point_3;
-using Vector_3 = typename Kernel::Vector_3;
-
+using Kernel                  = CGAL::Exact_predicates_inexact_constructions_kernel;
+using FT                      = typename Kernel::FT;
+using Point_3                 = typename Kernel::Point_3;
+using Vector_3                = typename Kernel::Vector_3;
+using Affine_transformation_3 = typename Kernel::Aff_transformation_3;
 using TAG                     = CGAL::Sequential_tag;
 using Surface_mesh            = CGAL::Surface_mesh<Point_3>;
 using Polyhedron              = CGAL::Polyhedron_3<Kernel>;
-using Affine_transformation_3 = CGAL::Aff_transformation_3<Kernel>;
+
 
 namespace PMP = CGAL::Polygon_mesh_processing;
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/delaunay_remeshing_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/delaunay_remeshing_test.cpp
index d1d70fdd1e2a..74a968ec0950 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/delaunay_remeshing_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/delaunay_remeshing_test.cpp
@@ -1,11 +1,12 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-
-#include <CGAL/Surface_mesh.h>
-#include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polygon_mesh_processing/detect_features.h>
 #include <CGAL/Polygon_mesh_processing/surface_Delaunay_remeshing.h>
 #include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
 
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Polyhedron_3.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <vector>
 #include <fstream>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/extrude_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/extrude_test.cpp
index b51bf4553f09..0bada4492f98 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/extrude_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/extrude_test.cpp
@@ -1,7 +1,9 @@
+#include <CGAL/Polygon_mesh_processing/extrude.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Polygon_mesh_processing/extrude.h>
+
 #include <iostream>
 #include <fstream>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp
index ac066d3ae1a9..df1531c64291 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/fairing_test.cpp
@@ -1,8 +1,9 @@
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/fair.h>
+
 #include <CGAL/Surface_mesh.h>
 
-#include <CGAL/Polygon_mesh_processing/fair.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <CGAL/Timer.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp
index 3050a34753f7..e406db12ec72 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/measures_test.cpp
@@ -1,11 +1,11 @@
 #include <CGAL/Polygon_mesh_processing/measure.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/bbox.h>
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Surface_mesh.h>
 
-#include <CGAL/Polygon_mesh_processing/bbox.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <CGAL/Bbox_3.h>
 
@@ -376,4 +376,3 @@ int main(int argc, char* argv[])
   std::cerr << "All done." << std::endl;
   return 0;
 }
-
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_mesh_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_mesh_test.cpp
index ce4855f964f2..4c90f3a17612 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_mesh_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_mesh_test.cpp
@@ -1,8 +1,10 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/orientation.h>
+
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/Polygon_mesh_processing/orientation.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <CGAL/Timer.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp
index f3c541ab65ca..b72e0397fb19 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/orient_polygon_soup_test.cpp
@@ -1,18 +1,20 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-
-#include <CGAL/Polyhedron_3.h>
-#include <CGAL/Surface_mesh.h>
-
-#include <CGAL/Cartesian_converter.h>
-#include <CGAL/IO/polygon_mesh_io.h>
-#include <CGAL/IO/polygon_soup_io.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include <CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup_extension.h>
 
+#include <CGAL/IO/polygon_mesh_io.h>
+#include <CGAL/IO/polygon_soup_io.h>
+
+#include <CGAL/Polyhedron_3.h>
+#include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
+#include <CGAL/Cartesian_converter.h>
+
 #include <algorithm>
 #include <cstdlib>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_compute_normals_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_compute_normals_test.cpp
index 3517709a72ab..20a8e8993a14 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_compute_normals_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_compute_normals_test.cpp
@@ -1,15 +1,16 @@
 // #define CGAL_PMP_COMPUTE_NORMAL_DEBUG_PP
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-//#include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h>
+#include <CGAL/Polygon_mesh_processing/compute_normal.h>
+#include <CGAL/Polygon_mesh_processing/bbox.h>
+#include <CGAL/Polygon_mesh_processing/shape_predicates.h>
 
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
 
 #include <CGAL/centroid.h>
-#include <CGAL/Polygon_mesh_processing/compute_normal.h>
-#include <CGAL/Polygon_mesh_processing/bbox.h>
-#include <CGAL/Polygon_mesh_processing/shape_predicates.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+//#include <CGAL/Exact_predicates_exact_constructions_kernel_with_sqrt.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp
index e06960044186..f9a083c580ec 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/pmp_do_intersect_test.cpp
@@ -1,17 +1,17 @@
+#include <CGAL/Polygon_mesh_processing/intersection.h>
 
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
-#include <sstream>
+#include <CGAL/Surface_mesh.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Polygon_mesh_processing/intersection.h>
-
-#include <CGAL/Surface_mesh.h>
 
 #include <CGAL/Timer.h>
 
+#include <cstdlib>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
 typedef CGAL::Exact_predicates_inexact_constructions_kernel     Epic;
 typedef CGAL::Exact_predicates_exact_constructions_kernel       Epec;
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp
index 0421bb411fc8..7029c29a2f8e 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_polyhedron_boundary_test.cpp
@@ -1,7 +1,6 @@
-
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Side_of_triangle_mesh.h>
 #include <CGAL/Polyhedron_3.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include "point_inside_helpers.h"
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_surface_mesh_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_surface_mesh_test.cpp
index b0be112cfbc1..ef7bf8f9e992 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_surface_mesh_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/point_inside_surface_mesh_test.cpp
@@ -1,11 +1,11 @@
+#include <CGAL/Side_of_triangle_mesh.h>
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
 #include <CGAL/boost/graph/helpers.h>
 
-#include <CGAL/Side_of_triangle_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include "point_inside_helpers.h"
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp
index add77378cbc9..d74eb2fba20a 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/polygon_mesh_slicer_test.cpp
@@ -1,20 +1,23 @@
 // #define USE_SURFACE_MESH
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_slicer.h>
+
 #ifdef USE_SURFACE_MESH
 #include <CGAL/Surface_mesh.h>
 #else
 #include <CGAL/Polyhedron_3.h>
 #endif
+
 #include <CGAL/AABB_halfedge_graph_segment_primitive.h>
 
-#include <CGAL/Polygon_mesh_slicer.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
 #include <CGAL/Polygon_2.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <fstream>
 #include <cassert>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_quality_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_quality_test.cpp
index 7ab20cda4246..ada019dee942 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_quality_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_quality_test.cpp
@@ -1,9 +1,11 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/remesh.h>
 #include <CGAL/Polygon_mesh_processing/Adaptive_sizing_field.h>
 #include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
 
+#include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <fstream>
 #include <limits>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test.cpp
index 40067cea5120..e8d69008fb04 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test.cpp
@@ -7,17 +7,18 @@
 //#define CGAL_PMP_REMESHING_VERY_VERBOSE
 //#define CGAL_PMP_REMESHING_EXPENSIVE_DEBUG
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-
-#include <CGAL/Surface_mesh.h>
-
 #include <CGAL/Polygon_mesh_processing/remesh.h>
 #include <CGAL/Polygon_mesh_processing/border.h>
 #include <CGAL/Polygon_mesh_processing/connected_components.h>
 #include <CGAL/Polygon_mesh_processing/self_intersections.h>
 #include <CGAL/Polygon_mesh_processing/detect_features.h>
 
+#include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Timer.h>
+
 #include <fstream>
 #include <vector>
 #include <cstdlib>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp
index eeebc63b3011..91deed70c468 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_test_P_SM_OM.cpp
@@ -1,14 +1,17 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/remesh.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-#include <fstream>
-#include <map>
 #include <OpenMesh/Core/IO/MeshIO.hh>
 #include <OpenMesh/Core/Mesh/PolyMesh_ArrayKernelT.hh>
 #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
 #include <CGAL/boost/graph/graph_traits_PolyMesh_ArrayKernelT.h>
 #include <CGAL/boost/graph/graph_traits_TriMesh_ArrayKernelT.h>
-#include <CGAL/Polygon_mesh_processing/remesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
+#include <fstream>
+#include <map>
 
 namespace PMP = CGAL::Polygon_mesh_processing;
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_with_isolated_constraints_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_with_isolated_constraints_test.cpp
index 4e7ebe960925..115f245a9bbf 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_with_isolated_constraints_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/remeshing_with_isolated_constraints_test.cpp
@@ -1,10 +1,11 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
+#include <CGAL/Polygon_mesh_processing/remesh.h>
+#include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
 
+#include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/boost/graph/generators.h>
-#include <CGAL/Polygon_mesh_processing/remesh.h>
-#include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <fstream>
 #include <iostream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_polyhedron_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_polyhedron_test.cpp
index 1d1991ee86bc..1c26f47456a5 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_polyhedron_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_polyhedron_test.cpp
@@ -1,15 +1,15 @@
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
-#include <sstream>
+#include <CGAL/Polygon_mesh_processing/self_intersections.h>
+
+#include <CGAL/Polyhedron_3.h>
+#include <CGAL/Timer.h>
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
-#include <CGAL/Polyhedron_3.h>
-#include <CGAL/Polygon_mesh_processing/self_intersections.h>
-
-#include <CGAL/Timer.h>
+#include <cstdlib>
+#include <iostream>
+#include <fstream>
+#include <sstream>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel     Epic;
 typedef CGAL::Exact_predicates_exact_constructions_kernel       Epec;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp
index 6e017c948c0b..1e64267703a4 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_surface_mesh_test.cpp
@@ -1,12 +1,13 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/self_intersections.h>
 #include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
+
+#include <CGAL/Surface_mesh.h>
 #include <CGAL/tags.h>
 #include <CGAL/Timer.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <cstdlib>
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp
index e067e13c129c..2cddabbdb964 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/self_intersection_triangle_soup_test.cpp
@@ -1,11 +1,12 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/self_intersections.h>
 #include <CGAL/IO/polygon_soup_io.h>
 #include <CGAL/tags.h>
+
 #include <CGAL/Timer.h>
+#include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <cstdlib>
 #include <iostream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp
index 04f7ddf5ee95..646f75e85db3 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/surface_intersection_sm_poly.cpp
@@ -1,15 +1,16 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/intersection.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 #include <CGAL/Linear_cell_complex_for_bgl_combinatorial_map_helper.h>
 #include <CGAL/iterator.h>
-
-#include <CGAL/Polygon_mesh_processing/intersection.h>
 #include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
 #include <CGAL/Timer.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <iostream>
 #include <fstream>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_autorefinement.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_autorefinement.cpp
index 3af3402a5f22..e04e07ba556e 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_autorefinement.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_autorefinement.cpp
@@ -1,5 +1,3 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 
 #include <CGAL/Polygon_mesh_processing/intersection.h>
 #include <CGAL/Polygon_mesh_processing/corefinement.h>
@@ -8,6 +6,9 @@
 
 #include <CGAL/IO/polygon_soup_io.h>
 
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <fstream>
 #include <sstream>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_coref_epic_points_identity.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_coref_epic_points_identity.cpp
index 03a50620020a..4c12d15f5de1 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_coref_epic_points_identity.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_coref_epic_points_identity.cpp
@@ -1,6 +1,6 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/corefinement.h>
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefine.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefine.cpp
index 31e4f9c71f2c..f5f59e4419be 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefine.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefine.cpp
@@ -1,7 +1,9 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/corefinement.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/Polygon_mesh_processing/corefinement.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_and_constraints.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_and_constraints.cpp
index 6508c4533375..b88c1c712727 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_and_constraints.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_and_constraints.cpp
@@ -1,6 +1,6 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/corefinement.h>
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp
index 8356106a9b1d..49a182d2bd31 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_corefinement_bool_op.cpp
@@ -2,9 +2,9 @@
 // #define CGAL_COREFINEMENT_DEBUG
 #define  CGAL_USE_DERIVED_SURFACE_MESH
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/corefinement.h>
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <iostream>
 #include <vector>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_decimation_of_planar_patches.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_decimation_of_planar_patches.cpp
index 8666d862dc41..7ee0c4861066 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_decimation_of_planar_patches.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_decimation_of_planar_patches.cpp
@@ -1,9 +1,3 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#ifdef USE_POLYHEDRON
-#include <CGAL/Polyhedron_3.h>
-#else
-#include <CGAL/Surface_mesh.h>
-#endif
 #include <CGAL/Polygon_mesh_processing/remesh_planar_patches.h>
 #include <CGAL/Polygon_mesh_processing/region_growing.h>
 #include <CGAL/Polygon_mesh_processing/manifoldness.h>
@@ -12,6 +6,14 @@
 #include <CGAL/Polygon_mesh_processing/remesh.h>
 #include <CGAL/subdivision_method_3.h>
 
+#ifdef USE_POLYHEDRON
+#include <CGAL/Polyhedron_3.h>
+#else
+#include <CGAL/Surface_mesh.h>
+#endif
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <iostream>
 #include <fstream>
 #include <sstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_degenerate_pmp_clip_split_corefine.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_degenerate_pmp_clip_split_corefine.cpp
index 0decb1164994..1027c841cfbd 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_degenerate_pmp_clip_split_corefine.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_degenerate_pmp_clip_split_corefine.cpp
@@ -1,8 +1,7 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polygon_mesh_processing/clip.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 // #define CGAL_DEBUG_PMP_CLIP
 
 // TODO: test coref
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp
index e2d84414b1fb..5e558a287d09 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_detect_features.cpp
@@ -1,7 +1,7 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/detect_features.h>
 #include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
-#include <CGAL/Polygon_mesh_processing/detect_features.h>
 #include <CGAL/Real_timer.h>
 
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_does_bound_a_volume.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_does_bound_a_volume.cpp
index b19f892b98c2..e8c2dbc8678a 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_does_bound_a_volume.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_does_bound_a_volume.cpp
@@ -1,6 +1,6 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_hausdorff_bounded_error_distance.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_hausdorff_bounded_error_distance.cpp
index dc5269ac7162..3e011b42feea 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_hausdorff_bounded_error_distance.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_hausdorff_bounded_error_distance.cpp
@@ -4,22 +4,24 @@
 // Use this def in order to get all DEBUG info related to the bounded-error Hausdorff code!
 #define CGAL_HAUSDORFF_DEBUG
 
-#include <CGAL/Simple_cartesian.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
-#include <CGAL/Polyhedron_3.h>
-
-#include <CGAL/Aff_transformation_3.h>
-#include <CGAL/Bbox_3.h>
-#include <CGAL/IO/PLY.h>
 #include <CGAL/Polygon_mesh_processing/bbox.h>
 #include <CGAL/Polygon_mesh_processing/distance.h>
 #include <CGAL/Polygon_mesh_processing/remesh.h>
 #include <CGAL/Polygon_mesh_processing/random_perturbation.h>
 #include <CGAL/Polygon_mesh_processing/transform.h>
+#include <CGAL/Aff_transformation_3.h>
+#include <CGAL/Bbox_3.h>
+#include <CGAL/IO/PLY.h>
+
 #include <CGAL/Real_timer.h>
 
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Polyhedron_3.h>
+
+#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 using SCK   = CGAL::Simple_cartesian<double>;
 using EPICK = CGAL::Exact_predicates_inexact_constructions_kernel;
 using EPECK = CGAL::Exact_predicates_exact_constructions_kernel;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_interpolated_corrected_curvatures.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_interpolated_corrected_curvatures.cpp
index c6a578c795a8..412443a42c74 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_interpolated_corrected_curvatures.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_interpolated_corrected_curvatures.cpp
@@ -1,4 +1,3 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polygon_mesh_processing/interpolated_corrected_curvatures.h>
 #include <CGAL/Polygon_mesh_processing/random_perturbation.h>
 #include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
@@ -6,6 +5,8 @@
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/property_map.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <boost/graph/graph_traits.hpp>
 
 #include <iostream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp
index ce72e576c507..a2843ecae8ca 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_is_polygon_soup_a_polygon_mesh.cpp
@@ -1,17 +1,18 @@
-#include <CGAL/Simple_cartesian.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-
-#include <CGAL/Polyhedron_3.h>
-#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
+#include <CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h>
+#include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/boost/graph/property_maps.h>
 #include <CGAL/Dynamic_property_map.h>
-#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
-#include <CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h>
-#include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
+
 #include <CGAL/IO/OFF.h>
 
+#include <CGAL/Polyhedron_3.h>
+
+#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <array>
 #include <string>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_isolevel_refinement.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_isolevel_refinement.cpp
index 9e07c8314352..c61697135dd5 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_isolevel_refinement.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_isolevel_refinement.cpp
@@ -1,9 +1,9 @@
-#include <CGAL/Simple_cartesian.h>
-#include <CGAL/Surface_mesh.h>
-
 #include <CGAL/Polygon_mesh_processing/refine_mesh_at_isolevel.h>
 #include <CGAL/Polygon_mesh_processing/connected_components.h>
 
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Simple_cartesian.h>
+
 #include <fstream>
 #include <iostream>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp
index 2bb8c3cc3fbc..228f3b4c558b 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_merging_border_vertices.cpp
@@ -1,11 +1,9 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
-
 #include <CGAL/Polygon_mesh_processing/merge_border_vertices.h>
-#include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
 
-#include <fstream>
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
+#include <fstream>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef CGAL::Surface_mesh<K::Point_3> Surface_mesh;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_mesh_smoothing.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_mesh_smoothing.cpp
index 986bdca5b533..de001979aad5 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_mesh_smoothing.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_mesh_smoothing.cpp
@@ -1,9 +1,10 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h>
+#include <CGAL/Polygon_mesh_processing/tangential_relaxation.h>
 
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/Polygon_mesh_processing/angle_and_area_smoothing.h>
-#include <CGAL/Polygon_mesh_processing/tangential_relaxation.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <CGAL/property_map.h>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp
index 827e169310b9..03076dc39d64 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_orient_cc.cpp
@@ -1,10 +1,12 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/orientation.h>
+#include <CGAL/Polygon_mesh_processing/corefinement.h>
+
 #include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/Polygon_mesh_processing/orientation.h>
-#include <CGAL/Polygon_mesh_processing/corefinement.h>
 #include <CGAL/Timer.h>
+
 #include <iostream>
 #include <fstream>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp
index c564403312a0..eb38a6ad144f 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_clip.cpp
@@ -1,10 +1,11 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polygon_mesh_processing/clip.h>
+#include <CGAL/Polygon_mesh_processing/transform.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/Polygon_mesh_processing/transform.h>
 
-#include <CGAL/boost/graph/Face_filtered_graph.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <boost/property_map/property_map.hpp>
 
 #include <iostream>
@@ -879,5 +880,3 @@ int main()
   std::cout << "Done!" << std::endl;
   return EXIT_SUCCESS;
 }
-
-
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_collision_detection.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_collision_detection.cpp
index e8e28c9c2bd8..986f3b8768ec 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_collision_detection.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_collision_detection.cpp
@@ -1,8 +1,9 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Rigid_triangle_mesh_collision_detection.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
 
-#include <CGAL/Rigid_triangle_mesh_collision_detection.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp
index d0554ebc9a6e..2ef00998069e 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_locate.cpp
@@ -1,6 +1,4 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Polygon_mesh_processing/locate.h>
 
 // Graphs
 #include <CGAL/Polyhedron_3.h>
@@ -9,7 +7,9 @@
 #include <CGAL/boost/graph/graph_traits_Regular_triangulation_2.h>
 #include <CGAL/boost/graph/properties_Regular_triangulation_2.h>
 
-#include <CGAL/Polygon_mesh_processing/locate.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Simple_cartesian.h>
 
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
@@ -23,12 +23,11 @@
 #include <CGAL/Origin.h>
 #include <CGAL/property_map.h>
 #include <CGAL/Random.h>
-#include <CGAL/Unique_hash_map.h>
 
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/properties.hpp>
-#include <optional>
 
+#include <optional>
 #include <fstream>
 #include <iostream>
 #include <limits>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp
index bd48a31364a0..4bf08dd6c34c 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_manifoldness.cpp
@@ -1,10 +1,11 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/repair.h>
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Surface_mesh.h>
 
 #include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/Polygon_mesh_processing/repair.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <cassert>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_non_conforming_snapping.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_non_conforming_snapping.cpp
index d091b7a3d25f..67390e17648d 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_non_conforming_snapping.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_non_conforming_snapping.cpp
@@ -1,21 +1,21 @@
 //#define CGAL_PMP_SNAP_DEBUG_PP
 //#define CGAL_PMP_SNAP_DEBUG_OUTPUT
 
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-
-#include <CGAL/Polyhedron_3.h>
-#include <CGAL/Polyhedron_items_with_id_3.h>
-#include <CGAL/Surface_mesh.h>
-
 #include <CGAL/Polygon_mesh_processing/border.h>
 #include <CGAL/Polygon_mesh_processing/internal/Snapping/snap.h>
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 
+#include <CGAL/Polyhedron_3.h>
+#include <CGAL/Polyhedron_items_with_id_3.h>
+#include <CGAL/Surface_mesh.h>
+
 #include <CGAL/property_map.h>
 #include <CGAL/IO/STL.h>
 
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <array>
 #include <iostream>
 #include <fstream>
@@ -169,4 +169,3 @@ int main(int, char**)
 
   return EXIT_SUCCESS;
 }
-
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp
index a9b59a6ffaa6..ed5d96771656 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_np_function.cpp
@@ -1,12 +1,15 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/compute_normal.h>
+#include <CGAL/boost/graph/named_params_helper.h>
+#include <CGAL/Named_function_parameters.h>
+
 #include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <sstream>
 #include <iostream>
 #include <unordered_map>
 
-#include <CGAL/boost/graph/named_params_helper.h>
-#include <CGAL/Named_function_parameters.h>
-#include <CGAL/Polygon_mesh_processing/compute_normal.h>
 
 namespace CGAL {
 template <class PolygonMesh,
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_polyhedral_envelope.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_polyhedral_envelope.cpp
index 1e669ff1039e..1676f97a4b1c 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_polyhedral_envelope.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_polyhedral_envelope.cpp
@@ -1,10 +1,12 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
-#include <CGAL/Polyhedron_3.h>
-#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
 #include <CGAL/Polyhedral_envelope.h>
 #include <CGAL/Polygon_mesh_processing/repair_self_intersections.h>
+#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
+
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Polyhedron_3.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 namespace PMP = CGAL::Polygon_mesh_processing;
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_read_polygon_mesh.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_read_polygon_mesh.cpp
index 1727cdfaee47..447fe007c99b 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_read_polygon_mesh.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_read_polygon_mesh.cpp
@@ -1,4 +1,4 @@
-#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
 
 #include <CGAL/Surface_mesh.h>
 
@@ -8,7 +8,7 @@
 #include <CGAL/Linear_cell_complex_for_bgl_combinatorial_map_helper.h>
 #include <CGAL/boost/graph/graph_traits_Linear_cell_complex_for_combinatorial_map.h>
 
-#include <CGAL/Polygon_mesh_processing/IO/polygon_mesh_io.h>
+#include <CGAL/Simple_cartesian.h>
 
 #include <fstream>
 #include <vector>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp
index a94e1adadc64..e832627b1629 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_remove_border_edge.cpp
@@ -1,7 +1,9 @@
-#include <CGAL/Simple_cartesian.h>
+#include <CGAL/Polygon_mesh_processing/repair.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
-#include <CGAL/Polygon_mesh_processing/repair.h>
+
+#include <CGAL/Simple_cartesian.h>
 
 #include <fstream>
 #include <cassert>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp
index de7e7a2d49ec..847e9dbf6155 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_degeneracies.cpp
@@ -1,14 +1,14 @@
 #define CGAL_PMP_DEBUG_SMALL_CC_REMOVAL
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/connected_components.h>
+#include <CGAL/Polygon_mesh_processing/repair.h>
 
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
 
-#include <CGAL/Polygon_mesh_processing/connected_components.h>
-#include <CGAL/Polygon_mesh_processing/repair.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_self_intersections.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_self_intersections.cpp
index 822ab16169a8..116e0d57db1c 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_self_intersections.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_repair_self_intersections.cpp
@@ -3,12 +3,12 @@
 #define CGAL_PMP_REMOVE_SELF_INTERSECTION_DEBUG
 #define CGAL_PMP_REMOVE_SELF_INTERSECTION_OUTPUT
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
-
 #include <CGAL/Polygon_mesh_processing/repair.h>
 #include <CGAL/Polygon_mesh_processing/self_intersections.h>
 
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <iostream>
 #include <fstream>
 #include <unordered_map>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp
index fa5fd3ba4793..3c2355717b9d 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_snapping.cpp
@@ -1,18 +1,18 @@
 // #define CGAL_PMP_SNAP_DEBUG_PP
 
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/border.h>
+#include <CGAL/Polygon_mesh_processing/internal/Snapping/snap.h>
+#include <CGAL/Polygon_mesh_processing/internal/Snapping/helper.h>
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
 #include <CGAL/Surface_mesh.h>
 
-#include <CGAL/Polygon_mesh_processing/border.h>
-#include <CGAL/Polygon_mesh_processing/internal/Snapping/helper.h>
-#include <CGAL/Polygon_mesh_processing/internal/Snapping/snap.h>
-
 #include <CGAL/property_map.h>
 
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <iostream>
 #include <fstream>
 #include <set>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp
index 65d64eb1cbe8..695d4862623f 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_transform.cpp
@@ -1,11 +1,12 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polygon_mesh_processing/transform.h>
-#include <iostream>
-#include <fstream>
 
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Aff_transformation_3.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
+#include <iostream>
+#include <fstream>
 
 
 namespace PMP = CGAL::Polygon_mesh_processing;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_triangle.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_triangle.cpp
index 6009318480d4..3bf1d7619344 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_triangle.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_pmp_triangle.cpp
@@ -1,8 +1,10 @@
 #include <CGAL/Polygon_mesh_processing/triangle.h>
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/boost/graph/generators.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 typedef K::Point_3 Point_3;
 typedef K::Triangle_3 Triangle_3;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_remove_caps_needles.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_remove_caps_needles.cpp
index fa80d93caf0b..505a731ed892 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_remove_caps_needles.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_remove_caps_needles.cpp
@@ -1,12 +1,13 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
-
 #include <CGAL/Polygon_mesh_processing/self_intersections.h>
-#include <fstream>
 #include <CGAL/Polygon_mesh_processing/repair_degeneracies.h>
+
 #include <CGAL/Polyhedral_envelope.h>
 #include <CGAL/Polygon_mesh_processing/measure.h>
 
+#include <CGAL/Surface_mesh.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
+#include <fstream>
 #include <iostream>
 #include <vector>
 
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp
index 4b9b0abbd3e0..e57d9b6903bd 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_repair_polygon_soup.cpp
@@ -1,11 +1,11 @@
 #define CGAL_PMP_REPAIR_POLYGON_SOUP_VERBOSE_PP
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-
 #include <CGAL/Polygon_mesh_processing/repair_polygon_soup.h>
 
 #include <CGAL/Surface_mesh.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <algorithm>
 #include <deque>
 #include <iostream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_predicates.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_predicates.cpp
index 7b1ef20f6a67..17228d4603ff 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_predicates.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_predicates.cpp
@@ -1,14 +1,15 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/shape_predicates.h>
+#include <CGAL/Polygon_mesh_processing/repair.h>
 
 #include <CGAL/Surface_mesh.h>
 
-#include <CGAL/Polygon_mesh_processing/repair.h>
-#include <CGAL/Polygon_mesh_processing/shape_predicates.h>
-
 #include <CGAL/number_type_config.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <fstream>
 #include <iostream>
+#include <vector>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel         K;
 typedef K::FT                                                       FT;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp
index 7ed64301e90a..3d726ff3d244 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_shape_smoothing.cpp
@@ -1,13 +1,13 @@
 #define CGAL_PMP_SMOOTHING_DEBUG
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/smooth_shape.h>
+#include <CGAL/Polygon_mesh_processing/measure.h>
 
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_items_with_id_3.h>
 
-#include <CGAL/Polygon_mesh_processing/measure.h>
-#include <CGAL/Polygon_mesh_processing/smooth_shape.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <CGAL/utility.h>
 #include <CGAL/use.h>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_simplify_polylines_pmp.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_simplify_polylines_pmp.cpp
index de196c65e643..770b055db8d6 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_simplify_polylines_pmp.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_simplify_polylines_pmp.cpp
@@ -1,5 +1,5 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polygon_mesh_processing/internal/simplify_polyline.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
 #include <vector>
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_split_volume.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_split_volume.cpp
index 167625a4bb5f..a6ef851b78d0 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_split_volume.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_split_volume.cpp
@@ -1,8 +1,11 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
 #include <CGAL/boost/graph/Face_filtered_graph.h>
 #include <CGAL/Polygon_mesh_processing/transform.h>
+
+#include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <boost/core/ref.hpp>
 
 #include <iostream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
index 1b78eb8ca752..d5d2fa63b9d8 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/test_stitching.cpp
@@ -1,15 +1,17 @@
 // #define CGAL_PMP_STITCHING_DEBUG_PP
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Polyhedron_3.h>
-#include <CGAL/Surface_mesh.h>
+#include <CGAL/Polygon_mesh_processing/stitch_borders.h>
+#include <CGAL/Polygon_mesh_processing/border.h>
 
 #include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/boost/graph/copy_face_graph.h>
 #include <CGAL/Dynamic_property_map.h>
-#include <CGAL/Polygon_mesh_processing/border.h>
-#include <CGAL/Polygon_mesh_processing/stitch_borders.h>
+
+#include <CGAL/Polyhedron_3.h>
+#include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <algorithm>
 #include <deque>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp
index 66085b83c745..8b7b8f345563 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_faces_test.cpp
@@ -1,6 +1,3 @@
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Surface_mesh.h>
 
 #include <CGAL/Polygon_mesh_processing/triangulate_faces.h>
 
@@ -10,6 +7,11 @@
 #include <CGAL/centroid.h>
 #include <CGAL/Polygon_mesh_processing/polygon_mesh_to_polygon_soup.h>
 
+#include <CGAL/Surface_mesh.h>
+
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <boost/graph/filtered_graph.hpp>
 
 #include <fstream>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
index 133060f0288e..5b87e5dff42b 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_no_delaunay_test.cpp
@@ -1,23 +1,22 @@
 //#define POLY
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 #include <CGAL/Polygon_mesh_processing/internal/Hole_filling/do_not_use_DT3.h>
+#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
+
 #ifdef POLY
 #include <CGAL/Polyhedron_3.h>
 #else
 #include <CGAL/Surface_mesh.h>
 #endif
-#include <CGAL/boost/graph/helpers.h>
-
-#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
-
-#include <CGAL/assertions.h>
 
+#include <CGAL/boost/graph/helpers.h>
 #include <CGAL/boost/graph/Euler_operations.h>
 
 #include <CGAL/Weights/uniform_weights.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 #include <cassert>
 #include <vector>
 #include <set>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
index 146eed2fd875..d2c69c01591b 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_Polyhedron_3_test.cpp
@@ -1,6 +1,8 @@
 //#define POLY
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
+
+
 #ifdef POLY
 #include <CGAL/Polyhedron_3.h>
 #else
@@ -10,9 +12,10 @@
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/assertions.h>
 #include <CGAL/boost/graph/Euler_operations.h>
-#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
 #include <CGAL/Weights/uniform_weights.h>
 
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <cassert>
 #include <vector>
 #include <set>
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp
index 7e96e187d915..3cf12f057016 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_polyline_test.cpp
@@ -1,6 +1,4 @@
-
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
 
 #include <cassert>
 #include <vector>
@@ -10,7 +8,9 @@
 #include <CGAL/Polyhedron_incremental_builder_3.h>
 #include <CGAL/Polyhedron_3.h>
 
-#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
+#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+#include <CGAL/Exact_predicates_exact_constructions_kernel.h>
+
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel  Epic;
 typedef CGAL::Exact_predicates_exact_constructions_kernel  Epec;
diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_with_cdt_2_test.cpp b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_with_cdt_2_test.cpp
index 8f1ede58b930..06bfc441eefe 100644
--- a/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_with_cdt_2_test.cpp
+++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/triangulate_hole_with_cdt_2_test.cpp
@@ -1,17 +1,20 @@
-#include <set>
-#include <vector>
-#include <fstream>
-#include <cassert>
-#include <string>
-
 #define CGAL_NO_CDT_2_WARNING
 
+#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
+#include <CGAL/Polygon_mesh_processing/orientation.h>
+
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/Polyhedron_3.h>
+
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
-#include <CGAL/Polygon_mesh_processing/triangulate_hole.h>
-#include <CGAL/Polygon_mesh_processing/orientation.h>
+
+#include <set>
+#include <vector>
+#include <fstream>
+#include <cassert>
+#include <string>
+
 
 template<
 class PolygonMesh,