diff --git a/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/read_polygon_mesh_for_cdt_3.h b/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/read_polygon_mesh_for_cdt_3.h
index 4f29b3b084f..235b89fd261 100644
--- a/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/read_polygon_mesh_for_cdt_3.h
+++ b/Constrained_triangulation_3/include/CGAL/Constrained_triangulation_3/internal/read_polygon_mesh_for_cdt_3.h
@@ -14,12 +14,23 @@
 
 #include <CGAL/license/Constrained_triangulation_3.h>
 
+#include <CGAL/boost/graph/named_params_helper.h>
 #include <CGAL/Constrained_triangulation_3/internal/cdt_debug_io.h>
 #include <CGAL/Constrained_triangulation_3/internal/ostream_redirect_guard.h>
-
+#include <CGAL/Named_function_parameters.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_self_intersections.h>
+
+#include <boost/property_map/property_map.hpp>
+
 #include <tl/expected.hpp>
+
+#include <cstddef>
+#include <iostream>
+#include <ostream>
 #include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
 
 namespace CGAL {
 
diff --git a/Installation/share/gdb/auto-load/cgal_printers.py b/Installation/share/gdb/auto-load/cgal_printers.py
index 5de1b26d590..6e0d8db2fd5 100644
--- a/Installation/share/gdb/auto-load/cgal_printers.py
+++ b/Installation/share/gdb/auto-load/cgal_printers.py
@@ -10,8 +10,8 @@ Auto-loaded via .debug_gdb_scripts section.
 """
 
 import re
-import gdb
 import os
+import gdb
 
 def base(val):
     """Get the base of a possibly derived CGAL type"""
@@ -67,11 +67,13 @@ class CGALPointPrinterBase:
 
 
 class PointC3Printer(CGALPointPrinterBase):
+    """Pretty printer for CGAL::PointC3<any>"""
     def __init__(self, val):
         super().__init__(val, "PointC3")
 
 
 class Point3Printer(CGALPointPrinterBase):
+    """Pretty printer for CGAL::Point_3<any>"""
     def __init__(self, val):
         super().__init__(val, "Point_3")
 
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h
index de2bcab9c1c..8c341e32962 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/orient_polygon_soup.h
@@ -27,12 +27,14 @@
 #include <boost/container/flat_set.hpp>
 #include <boost/container/flat_map.hpp>
 
-#include <set>
-#include <map>
-#include <stack>
-#include <vector>
+#include <array>
 #include <algorithm>
-#include <iostream>
+#include <cstddef>
+#include <iterator>
+#include <set>
+#include <stack>
+#include <utility>
+#include <vector>
 
 namespace CGAL {
 
diff --git a/STL_Extension/include/CGAL/assertions.h b/STL_Extension/include/CGAL/assertions.h
index cf793f466be..c5ad9ad2d30 100644
--- a/STL_Extension/include/CGAL/assertions.h
+++ b/STL_Extension/include/CGAL/assertions.h
@@ -21,6 +21,10 @@
 
 #include <CGAL/export/CGAL.h>
 
+#if __has_include(<version>)
+#  include <version>
+#endif
+
 // #include <CGAL/assertions_behaviour.h> // for backward compatibility
 
 #ifdef NDEBUG
diff --git a/STL_Extension/include/CGAL/exceptions.h b/STL_Extension/include/CGAL/exceptions.h
index 3b269aea302..7141ab71dcd 100644
--- a/STL_Extension/include/CGAL/exceptions.h
+++ b/STL_Extension/include/CGAL/exceptions.h
@@ -14,6 +14,7 @@
 #ifndef CGAL_EXCEPTIONS_H
 #define CGAL_EXCEPTIONS_H
 
+#include <exception>
 #include <stdexcept>
 #include <string>