From c21fc4f2384b4343ce588bc7fd4d3c60fbe8b64f Mon Sep 17 00:00:00 2001
From: Jane Tournois <janetournois@users.noreply.github.com>
Date: Wed, 6 Mar 2024 10:42:53 +0100
Subject: [PATCH] remove circular dependency and corresponding fwd declarations

include in helpers.h was introduced by 05285920114e53e1347cd980a91d4480963337b2
in 2019 for backward compatibility, it can now be removed
---
 BGL/include/CGAL/boost/graph/generators.h     | 24 -------------------
 BGL/include/CGAL/boost/graph/helpers.h        |  3 ---
 Convex_hull_3/include/CGAL/convex_hull_3.h    |  1 +
 .../oriented_bounding_box.h                   |  1 +
 .../Plugins/PCA/Basic_generator_plugin.cpp    |  1 +
 .../Plugins/PCA/Clipping_box_plugin.cpp       |  1 +
 .../Plugins/PCA/Create_bbox_mesh_plugin.cpp   |  2 ++
 .../Plugins/PCA/Edit_box_plugin.cpp           |  1 +
 .../Polyhedron/Plugins/PCA/Pca_plugin.cpp     |  1 +
 9 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/BGL/include/CGAL/boost/graph/generators.h b/BGL/include/CGAL/boost/graph/generators.h
index 25de662748e..638cebe54ef 100644
--- a/BGL/include/CGAL/boost/graph/generators.h
+++ b/BGL/include/CGAL/boost/graph/generators.h
@@ -29,30 +29,6 @@
 #include <unordered_map>
 
 namespace CGAL {
-namespace Euler {
-
-// Some forward declarations to break the helpers.h > generators.h > Euler_operations.h cycle
-template< typename Graph>
-void fill_hole(typename boost::graph_traits<Graph>::halfedge_descriptor h,
-               Graph& g);
-
-template<typename Graph , typename VertexRange >
-typename boost::graph_traits<Graph>::face_descriptor add_face(const VertexRange& vr,
-                                                              Graph& g);
-
-template<typename Graph>
-typename boost::graph_traits<Graph>::halfedge_descriptor
-split_face(typename boost::graph_traits<Graph>::halfedge_descriptor h1,
-           typename boost::graph_traits<Graph>::halfedge_descriptor h2,
-           Graph& g);
-
-} // namespace Euler
-
-template <typename SourceMesh, typename TargetMesh,
-          typename NamedParameters1, typename NamedParameters2>
-void copy_face_graph(const SourceMesh& sm, TargetMesh& tm,
-                     const NamedParameters1& np1,
-                     const NamedParameters2& np2);
 
 namespace internal {
 
diff --git a/BGL/include/CGAL/boost/graph/helpers.h b/BGL/include/CGAL/boost/graph/helpers.h
index 43016f9889f..32b99ba397d 100644
--- a/BGL/include/CGAL/boost/graph/helpers.h
+++ b/BGL/include/CGAL/boost/graph/helpers.h
@@ -1081,8 +1081,5 @@ int halfedge_index_in_face(typename boost::graph_traits<Graph>::halfedge_descrip
 
 } // namespace CGAL
 
-// Here at the bottom because helpers.h must include generators (for backward compatibility reasons),
-// and Euler_operations.h needs helpers.h
-#include <CGAL/boost/graph/generators.h>
 
 #endif // CGAL_BOOST_GRAPH_HELPERS_H
diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h
index 51555a5d57b..eac14144073 100644
--- a/Convex_hull_3/include/CGAL/convex_hull_3.h
+++ b/Convex_hull_3/include/CGAL/convex_hull_3.h
@@ -33,6 +33,7 @@
 
 #include <CGAL/Number_types/internal/Exact_type_selector.h>
 #include <CGAL/boost/graph/copy_face_graph.h>
+#include <CGAL/boost/graph/generators.h>
 #include <CGAL/Named_function_parameters.h>
 #include <CGAL/boost/graph/graph_traits_Triangulation_data_structure_2.h>
 #include <CGAL/boost/graph/properties_Triangulation_data_structure_2.h>
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 d64b73e699b..c867c190814 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
@@ -24,6 +24,7 @@
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/Named_function_parameters.h>
 #include <CGAL/boost/graph/named_params_helper.h>
+#include <CGAL/boost/graph/generators.h>
 #include <CGAL/convex_hull_3.h>
 #include <CGAL/Convex_hull_traits_3.h>
 #include <CGAL/Default.h>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp
index 51355a07b5f..7c4b491ce0b 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Basic_generator_plugin.cpp
@@ -8,6 +8,7 @@
 
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/boost/graph/Euler_operations.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include <CGAL/subdivision_method_3.h>
 #include <CGAL/Kernel_traits.h>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_plugin.cpp
index aa32c500594..079100d1fb6 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Clipping_box_plugin.cpp
@@ -15,6 +15,7 @@
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polygon_mesh_processing/compute_normal.h>
+#include <CGAL/boost/graph/generators.h>
 #include "Selection_visualizer.h"
 #include "Scene_plane_item.h"
 
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp
index ee591ddc04a..c227227f1bd 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp
@@ -3,6 +3,8 @@
 #include <CGAL/Three/Scene_item.h>
 #include <CGAL/Three/Scene_interface.h>
 
+#include <CGAL/boost/graph/generators.h>
+
 #include <QAction>
 #include <QMainWindow>
 #include <QMessageBox>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Edit_box_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Edit_box_plugin.cpp
index 77569a7b810..dc96135c003 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Edit_box_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Edit_box_plugin.cpp
@@ -7,6 +7,7 @@
 #include <CGAL/Three/Viewer_interface.h>
 #include <CGAL/Three/Three.h>
 #include <CGAL/boost/graph/helpers.h>
+#include <CGAL/boost/graph/generators.h>
 #include <QAction>
 #include <QMainWindow>
 #include <QApplication>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp
index 2fcecd22abd..66331a4a6d2 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp
@@ -11,6 +11,7 @@
 #include <CGAL/bounding_box.h>
 #include <CGAL/linear_least_squares_fitting_3.h>
 #include <CGAL/boost/graph/helpers.h>
+#include <CGAL/boost/graph/generators.h>
 
 #include "Kernel_type.h"
 #include <CGAL/Three/Three.h>