diff --git a/BGL/include/CGAL/boost/graph/io.h b/BGL/include/CGAL/boost/graph/io.h
index 9a74ebe93c9..4caf6c04e32 100644
--- a/BGL/include/CGAL/boost/graph/io.h
+++ b/BGL/include/CGAL/boost/graph/io.h
@@ -26,14 +26,14 @@
 #include <CGAL/boost/graph/Named_function_parameters.h>
 #include <CGAL/boost/graph/properties.h>
 #include <CGAL/Kernel_traits.h>
+
 #ifdef CGAL_USE_VTK
-#include <CGAL/IO/VTK/vtk_internals.h>
+#include <CGAL/IO/VTK.h>
 #endif
-#include <CGAL/IO/write_vtk.h>
+
 #include <CGAL/internal/Generic_facegraph_builder.h>
-#include <CGAL/IO/STL/STL_reader.h>
-#include <CGAL/IO/OBJ/OBJ_reader.h>
-#include <CGAL/IO/OBJ/File_writer_wavefront.h>
+#include <CGAL/IO/STL.h>
+#include <CGAL/IO/OBJ.h>
 
 namespace CGAL {
   /*!
diff --git a/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h b/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h
index 5679fcd0542..6c5d00c316b 100644
--- a/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h
+++ b/Linear_cell_complex/include/CGAL/Linear_cell_complex_constructors.h
@@ -12,9 +12,7 @@
 #ifndef CGAL_LINEAR_CELL_COMPLEX_CONSTRUCTORS_H
 #define CGAL_LINEAR_CELL_COMPLEX_CONSTRUCTORS_H 1
 
-#include <CGAL/IO/File_header_OFF.h>
-#include <CGAL/IO/File_scanner_OFF.h>
-#include <CGAL/IO/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/Linear_cell_complex_incremental_builder.h>
 
 #include <iostream>
diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp
index 61d8b46bfe4..5e8356dbd79 100644
--- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp
+++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/manifoldness_repair_example.cpp
@@ -3,7 +3,7 @@
 #include <CGAL/boost/graph/iterator.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
 #include <CGAL/Surface_mesh.h>
-#include <CGAL/IO/OFF_reader.h>
+#include <CGAL/IO/OFF.h>
 
 
 #include <fstream>
diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp
index 3c073c82c8b..4efe5856c0c 100644
--- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp
+++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/orient_polygon_soup_example.cpp
@@ -7,7 +7,7 @@
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
 
-#include <CGAL/IO/OFF_reader.h>
+#include <CGAL/IO/OFF.h>
 
 #include <vector>
 #include <fstream>
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
index 536f59db782..0acb4ab9780 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/repair.h
@@ -41,7 +41,7 @@
 
 #ifdef CGAL_PMP_REMOVE_DEGENERATE_FACES_DEBUG
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
-#include <CGAL/IO/OFF_reader.h>
+#include <CGAL/IO/OFF.h>
 #endif
 
 #include <boost/algorithm/minmax_element.hpp>
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 eabf7f14538..d86fc4a97f0 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
@@ -4,10 +4,10 @@
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Surface_mesh.h>
 
+#include <CGAL/algorithm.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
-
-#include <CGAL/algorithm.h>
 #include <CGAL/Timer.h>
 
 #include <fstream>
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 edfc4802110..819c851dfc8 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
@@ -4,7 +4,7 @@
 
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
-#include <CGAL/IO/OFF_reader.h>
+#include <CGAL/IO/OFF.h>
 
 #include <string>
 #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 7bdf106c1fa..f73c7147568 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
@@ -11,7 +11,7 @@
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 
 #include <CGAL/property_map.h>
-#include <CGAL/IO/STL_reader.h>
+#include <CGAL/IO/STL.h>
 
 #include <array>
 #include <iostream>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_io_plugin.cpp
index 580023022f7..00d966275c4 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_io_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/IO/OFF_io_plugin.cpp
@@ -1,22 +1,25 @@
 #include "Scene_surface_mesh_item.h"
 #include "Scene_polygon_soup_item.h"
 #include "Scene_points_with_normal_item.h"
+
 #include <CGAL/Three/Three.h>
-#include <CGAL/Polygon_mesh_processing/repair.h>
-
-
-#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
-
 #include <CGAL/Three/Polyhedron_demo_io_plugin_interface.h>
 #include <CGAL/Three/Three.h>
-#include <fstream>
 
-#include <CGAL/IO/File_scanner_OFF.h>
-#include <CGAL/IO/OBJ_reader.h>
+#include <CGAL/IO/OFF.h>
+#include <CGAL/IO/OBJ.h>
+#include <CGAL/Polygon_mesh_processing/repair.h>
+#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
+
 #include <QMessageBox>
 #include <QApplication>
 
+#include <iostream>
+#include <fstream>
+#include <limits>
+
 using namespace CGAL::Three;
+
 class Polyhedron_demo_off_plugin :
   public QObject,
   public Polyhedron_demo_io_plugin_interface
diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/PLY_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/PLY_io_plugin.cpp
index 6ce2fdeb793..42d85a952c6 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/IO/PLY_io_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/IO/PLY_io_plugin.cpp
@@ -3,17 +3,24 @@
 #include "Scene_textured_surface_mesh_item.h"
 #include "Scene_points_with_normal_item.h"
 
+#include <CGAL/IO/PLY.h>
+#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include <CGAL/Three/Polyhedron_demo_io_plugin_interface.h>
 #include <CGAL/Three/Three.h>
+
 #include <QInputDialog>
 #include <QApplication>
-#include <fstream>
-
-#include <CGAL/IO/PLY_reader.h>
-#include <CGAL/IO/PLY_writer.h>
-#include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include <QMessageBox>
+
+#include <fstream>
+#include <iostream>
+#include <limits>
+#include <sstream>
+#include <string>
+#include <vector>
+
 using namespace CGAL::Three;
+
 class Polyhedron_demo_ply_plugin :
   public QObject,
   public CGAL::Three::Polyhedron_demo_io_plugin_interface
diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/STL_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/STL_io_plugin.cpp
index d1d879bd5b4..208de3f4140 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/IO/STL_io_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/IO/STL_io_plugin.cpp
@@ -8,7 +8,7 @@
 #include <CGAL/Three/Three.h>
 #include <fstream>
 
-#include <CGAL/IO/STL_reader.h>
+#include <CGAL/IO/STL.h>
 #include <CGAL/boost/graph/io.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 
diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
index 7a84ee2d911..a997dfb4e92 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
@@ -1,40 +1,32 @@
-#include <vector>
-#include <queue>
+#define CGAL_PMP_REPAIR_POLYGON_SOUP_VERBOSE 1
 
 #include "Scene_polygon_soup_item.h"
 #include "Scene_surface_mesh_item.h"
+
 #include <CGAL/Three/Viewer_interface.h>
 #include <CGAL/Three/Triangle_container.h>
 #include <CGAL/Three/Edge_container.h>
 #include <CGAL/Three/Point_container.h>
 #include <CGAL/Three/Three.h>
 
-#include <QObject>
-#include <QApplication>
-#include <QtDebug>
+#include "triangulate_primitive.h"
 
-#include <set>
-#include <stack>
-#include <algorithm>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
-#include <CGAL/IO/OFF_reader.h>
-#include <CGAL/IO/File_writer_OFF.h>
-#include <CGAL/version.h> 
-
+#include <CGAL/array.h>
+#include <CGAL/IO/OFF.h>
+#include <CGAL/Polygon_mesh_processing/compute_normal.h>
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include <CGAL/Polygon_mesh_processing/orient_polygon_soup.h>
 #include <CGAL/Polygon_mesh_processing/orientation.h>
 #include <CGAL/Polygon_mesh_processing/repair.h>
-
-#define CGAL_PMP_REPAIR_POLYGON_SOUP_VERBOSE 1
 #include <CGAL/Polygon_mesh_processing/repair_polygon_soup.h>
-
 #include <CGAL/Polygon_2.h>
+#include <CGAL/version.h>
 
-#include <CGAL/Polygon_mesh_processing/compute_normal.h>
-#include "triangulate_primitive.h"
-#include <CGAL/array.h>
+#include <QObject>
+#include <QApplication>
+#include <QtDebug>
 
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics/stats.hpp>
@@ -43,8 +35,13 @@
 #include <boost/accumulators/statistics/max.hpp>
 #include <boost/accumulators/statistics/median.hpp>
 
+#include <algorithm>
 #include <map>
+#include <queue>
+#include <set>
+#include <stack>
 #include <streambuf>
+#include <vector>
 
 using namespace CGAL::Three;
 typedef Viewer_interface Vi;
diff --git a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
index a648b3e4cf3..2e1cdb736b1 100644
--- a/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_surface_mesh_item.cpp
@@ -33,9 +33,7 @@
 #include <CGAL/Polygon_mesh_processing/polygon_soup_to_polygon_mesh.h>
 #include "triangulate_primitive.h"
 
-#include <CGAL/IO/File_writer_wavefront.h>
-#include <CGAL/IO/generic_copy_OFF.h>
-#include <CGAL/IO/OBJ_reader.h>
+#include <CGAL/IO/OBJ.h>
 #include <CGAL/Polygon_mesh_processing/measure.h>
 #include <CGAL/statistics_helpers.h>
 
diff --git a/Polyhedron/include/CGAL/IO/Polyhedron_builder_from_STL.h b/Polyhedron/include/CGAL/IO/Polyhedron_builder_from_STL.h
index 43570051c2a..80987fddebf 100644
--- a/Polyhedron/include/CGAL/IO/Polyhedron_builder_from_STL.h
+++ b/Polyhedron/include/CGAL/IO/Polyhedron_builder_from_STL.h
@@ -15,7 +15,7 @@
 
 #include <CGAL/Modifier_base.h>
 #include <CGAL/Polyhedron_incremental_builder_3.h>
-#include <CGAL/IO/STL_reader.h>
+#include <CGAL/IO/STL.h>
 
 #include <iostream>
 
diff --git a/Polyhedron/include/CGAL/IO/Polyhedron_scan_OFF.h b/Polyhedron/include/CGAL/IO/Polyhedron_scan_OFF.h
index d184008856f..ed245ddec25 100644
--- a/Polyhedron/include/CGAL/IO/Polyhedron_scan_OFF.h
+++ b/Polyhedron/include/CGAL/IO/Polyhedron_scan_OFF.h
@@ -18,11 +18,11 @@
 #include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
-#include <CGAL/IO/OFF/File_header_OFF.h>
-#include <CGAL/IO/OFF/File_scanner_OFF.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/Modifier_base.h>
 #include <CGAL/Polyhedron_incremental_builder_3.h>
 #include <CGAL/Polyhedron_3.h>
+
 #include <iostream>
 #include <cstddef>
 
diff --git a/Polyhedron/include/CGAL/IO/print_OFF.h b/Polyhedron/include/CGAL/IO/print_OFF.h
index 00e752fda79..7626f26fb0e 100644
--- a/Polyhedron/include/CGAL/IO/print_OFF.h
+++ b/Polyhedron/include/CGAL/IO/print_OFF.h
@@ -15,12 +15,11 @@
 
 #include <CGAL/license/Polyhedron.h>
 
-
-#include <CGAL/basic.h>
-#include <CGAL/IO/OFF/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/IO/generic_print_polyhedron.h>
 #include <CGAL/Polyhedron_3.h>
-#include <iostream>
+
+#include <fstream>
 
 namespace CGAL {
 
diff --git a/Stream_support/examples/Stream_support/off2off.cpp b/Stream_support/examples/Stream_support/off2off.cpp
index 49b705a0fde..28f54bfecc8 100644
--- a/Stream_support/examples/Stream_support/off2off.cpp
+++ b/Stream_support/examples/Stream_support/off2off.cpp
@@ -1,8 +1,9 @@
 // Copies a file in OFF format.
 
 #include <CGAL/IO/Verbose_ostream.h>
-#include <CGAL/IO/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/IO/generic_copy_OFF.h>
+
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
diff --git a/Stream_support/examples/Stream_support/off_bbox.cpp b/Stream_support/examples/Stream_support/off_bbox.cpp
index 278fa7b2226..669cf7f90b8 100644
--- a/Stream_support/examples/Stream_support/off_bbox.cpp
+++ b/Stream_support/examples/Stream_support/off_bbox.cpp
@@ -2,7 +2,8 @@
 
 #include <CGAL/Bbox_3.h>
 #include <CGAL/IO/Verbose_ostream.h>
-#include <CGAL/IO/File_scanner_OFF.h>
+#include <CGAL/IO/OFF.h>
+
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
@@ -10,7 +11,6 @@
 #include <fstream>
 #include <cfloat>
 
-
 using namespace std;
 
 bool  verbose   = false;
diff --git a/Stream_support/examples/Stream_support/off_glue.cpp b/Stream_support/examples/Stream_support/off_glue.cpp
index 6948c8902b0..1319873fc6f 100644
--- a/Stream_support/examples/Stream_support/off_glue.cpp
+++ b/Stream_support/examples/Stream_support/off_glue.cpp
@@ -1,9 +1,10 @@
 // Glue vertices of a polyhedron together that have equal coordinate values.
 
 #include <CGAL/Simple_cartesian.h>
+
 #include <CGAL/IO/Verbose_ostream.h>
-#include <CGAL/IO/File_scanner_OFF.h>
-#include <CGAL/IO/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
+
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
diff --git a/Stream_support/examples/Stream_support/off_transform.cpp b/Stream_support/examples/Stream_support/off_transform.cpp
index 34b334172e2..39232304bc6 100644
--- a/Stream_support/examples/Stream_support/off_transform.cpp
+++ b/Stream_support/examples/Stream_support/off_transform.cpp
@@ -1,9 +1,10 @@
 // Applies translation and scaling to an OFF object.
 
 #include <CGAL/Simple_cartesian.h>
+
 #include <CGAL/IO/Verbose_ostream.h>
-#include <CGAL/IO/File_scanner_OFF.h>
-#include <CGAL/IO/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
+
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
diff --git a/Stream_support/include/CGAL/IO/OFF.h b/Stream_support/include/CGAL/IO/OFF.h
index 142126eae5c..7b025ef4ca5 100644
--- a/Stream_support/include/CGAL/IO/OFF.h
+++ b/Stream_support/include/CGAL/IO/OFF.h
@@ -11,9 +11,10 @@
 #ifndef CGAL_IO_OFF_H
 #define CGAL_IO_OFF_H
 
-#include <CGAL/IO/OFF/OFF_reader.h>
-#include <CGAL/IO/OFF/File_scanner_OFF.h>
 #include <CGAL/IO/reader_helpers.h>
+#include <CGAL/IO/OFF/OFF_reader.h>
+#include <CGAL/IO/OFF/OFF_writer.h>
+#include <CGAL/IO/OFF/File_scanner_OFF.h>
 #include <CGAL/IO/OFF/File_writer_OFF.h>
 
 #include <vector>
diff --git a/Stream_support/include/CGAL/IO/OFF/OFF_reader.h b/Stream_support/include/CGAL/IO/OFF/OFF_reader.h
index b3b7797041f..d65ea7489fe 100644
--- a/Stream_support/include/CGAL/IO/OFF/OFF_reader.h
+++ b/Stream_support/include/CGAL/IO/OFF/OFF_reader.h
@@ -15,14 +15,16 @@
 #include <CGAL/IO/OFF/File_scanner_OFF.h>
 #include <CGAL/IO/reader_helpers.h>
 
-#include <vector>
-#include <iostream>
 #include <CGAL/array.h>
 #include <CGAL/assertions.h>
 #include <CGAL/use.h>
 
+#include <vector>
+#include <iostream>
+
 namespace CGAL {
 namespace OFF_internal {
+
 template <class Point_3, class Polygon_3>
 bool
 read_OFF( std::istream& in,
diff --git a/Stream_support/src/CGAL/File_header_OFF.cpp b/Stream_support/src/CGAL/File_header_OFF.cpp
index 99298cd127e..a1401ada008 100644
--- a/Stream_support/src/CGAL/File_header_OFF.cpp
+++ b/Stream_support/src/CGAL/File_header_OFF.cpp
@@ -16,8 +16,8 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/IO/File_header_OFF.h>
-#include <CGAL/IO/File_header_OFF_impl.h>
+#include <CGAL/IO/OFF/File_header_OFF.h>
+#include <CGAL/IO/OFF/File_header_OFF_impl.h>
 
 #endif // CGAL_HEADER_ONLY
 
diff --git a/Stream_support/src/CGAL/File_header_extended_OFF.cpp b/Stream_support/src/CGAL/File_header_extended_OFF.cpp
index d4381d1d8b1..5514f51de70 100644
--- a/Stream_support/src/CGAL/File_header_extended_OFF.cpp
+++ b/Stream_support/src/CGAL/File_header_extended_OFF.cpp
@@ -16,8 +16,8 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/IO/File_header_extended_OFF.h>
-#include <CGAL/IO/File_header_extended_OFF_impl.h>
+#include <CGAL/IO/OFF/File_header_extended_OFF.h>
+#include <CGAL/IO/OFF/File_header_extended_OFF_impl.h>
 
 #endif // CGAL_HEADER_ONLY
 
diff --git a/Stream_support/src/CGAL/File_scanner_OFF.cpp b/Stream_support/src/CGAL/File_scanner_OFF.cpp
index 924638aee86..d1bd706f97d 100644
--- a/Stream_support/src/CGAL/File_scanner_OFF.cpp
+++ b/Stream_support/src/CGAL/File_scanner_OFF.cpp
@@ -16,8 +16,8 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/IO/File_scanner_OFF.h>
-#include <CGAL/IO/File_scanner_OFF_impl.h>
+#include <CGAL/IO/OFF/File_scanner_OFF.h>
+#include <CGAL/IO/OFF/File_scanner_OFF_impl.h>
 
 #endif // CGAL_HEADER_ONLY
 
diff --git a/Stream_support/src/CGAL/File_writer_OFF.cpp b/Stream_support/src/CGAL/File_writer_OFF.cpp
index 924f832494b..c5991d30ce5 100644
--- a/Stream_support/src/CGAL/File_writer_OFF.cpp
+++ b/Stream_support/src/CGAL/File_writer_OFF.cpp
@@ -16,8 +16,8 @@
 
 #ifndef CGAL_HEADER_ONLY
 
-#include <CGAL/IO/File_writer_OFF.h>
-#include <CGAL/IO/File_writer_OFF_impl.h>
+#include <CGAL/IO/OFF/File_writer_OFF.h>
+#include <CGAL/IO/OFF/File_writer_OFF_impl.h>
 
 #endif // CGAL_HEADER_ONLY
 
diff --git a/Stream_support/test/Stream_support/stl2off.cpp b/Stream_support/test/Stream_support/stl2off.cpp
index d4ed55b1038..f8922b10b79 100644
--- a/Stream_support/test/Stream_support/stl2off.cpp
+++ b/Stream_support/test/Stream_support/stl2off.cpp
@@ -1,7 +1,7 @@
 #include <CGAL/Exact_predicates_exact_constructions_kernel.h>
 
 #include <CGAL/array.h>
-#include <CGAL/IO/STL_reader.h>
+#include <CGAL/IO/STL.h>
 
 #include <cassert>
 #include <fstream>
diff --git a/Stream_support/test/Stream_support/test_STL.cpp b/Stream_support/test/Stream_support/test_STL.cpp
index 6243d12d65f..4c00024f66d 100644
--- a/Stream_support/test/Stream_support/test_STL.cpp
+++ b/Stream_support/test/Stream_support/test_STL.cpp
@@ -1,7 +1,7 @@
-#include <CGAL/IO/STL/STL_reader.h>
-#include <CGAL/IO/STL/STL_writer.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 
+#include <CGAL/IO/STL.h>
+
 #include <iostream>
 #include <fstream>
 #include <vector>
diff --git a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
index e6a397f9941..fa304ca6027 100644
--- a/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
+++ b/Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
@@ -42,7 +42,7 @@
 #include <CGAL/boost/graph/copy_face_graph.h>
 #include <CGAL/boost/graph/iterator.h>
 #include <CGAL/boost/graph/Euler_operations.h>
-#include <CGAL/IO/File_scanner_OFF.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/Surface_mesh/IO/PLY.h>
 #include <CGAL/Handle_hash_function.h>
 #include <CGAL/boost/graph/named_params_helper.h>
diff --git a/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_file_writer.h b/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_file_writer.h
index 3364f63212e..ec348195739 100644
--- a/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_file_writer.h
+++ b/Surface_mesher/include/CGAL/IO/Complex_2_in_triangulation_3_file_writer.h
@@ -19,7 +19,7 @@
 
 #define CGAL_C2T3_USE_FILE_WRITER_OFF
 
-#include <CGAL/IO/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
 
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_incremental_builder_3.h>
diff --git a/TDS_2/include/CGAL/Triangulation_data_structure_2.h b/TDS_2/include/CGAL/Triangulation_data_structure_2.h
index 303115158b2..edf816c5903 100644
--- a/TDS_2/include/CGAL/Triangulation_data_structure_2.h
+++ b/TDS_2/include/CGAL/Triangulation_data_structure_2.h
@@ -37,8 +37,7 @@
 #include <CGAL/Triangulation_ds_iterators_2.h>
 #include <CGAL/Triangulation_ds_circulators_2.h>
 
-#include <CGAL/IO/File_header_OFF.h>
-#include <CGAL/IO/File_scanner_OFF.h>
+#include <CGAL/IO/OFF.h>
 
 namespace CGAL { 
 
diff --git a/Triangulation_2/examples/Triangulation_2/terr_trian.cpp b/Triangulation_2/examples/Triangulation_2/terr_trian.cpp
index 08d79771a82..783a6889a7e 100644
--- a/Triangulation_2/examples/Triangulation_2/terr_trian.cpp
+++ b/Triangulation_2/examples/Triangulation_2/terr_trian.cpp
@@ -2,12 +2,13 @@
 // (Terrain triangulation)
 
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
+
 #include <CGAL/IO/Verbose_ostream.h>
-#include <CGAL/IO/File_scanner_OFF.h>
-#include <CGAL/IO/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/Projection_traits_xy_3.h>
 #include <CGAL/Triangulation_2.h>
 #include <CGAL/Delaunay_triangulation_2.h>
+
 #include <cstddef>
 #include <cstdlib>
 #include <cstring>
diff --git a/Triangulation_3/demo/Triangulation_3/Scene.cpp b/Triangulation_3/demo/Triangulation_3/Scene.cpp
index 50df80a6051..4c49075580e 100644
--- a/Triangulation_3/demo/Triangulation_3/Scene.cpp
+++ b/Triangulation_3/demo/Triangulation_3/Scene.cpp
@@ -4,9 +4,7 @@
 #include <iostream>
 #include <fstream>
 
-#include <CGAL/IO/File_scanner_OFF.h>
-#include <CGAL/IO/File_header_OFF.h>
-#include <CGAL/IO/File_writer_OFF.h>
+#include <CGAL/IO/OFF.h>
 #include <CGAL/IO/read_off_points.h>
 #include <CGAL/IO/write_off_points.h>
 #include <CGAL/IO/read_xyz_points.h>