diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h
index 00131f48da0..ed00b93c2a4 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h
@@ -19,13 +19,13 @@
 
 
 
-#ifndef CGAL_AG2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H
-#define CGAL_AG2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H
 
 #include <CGAL/enum.h>
 #include <CGAL/Number_type_traits.h>
 
-#include <CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h>
+#include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
 
 CGAL_BEGIN_NAMESPACE
@@ -96,4 +96,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_BOUNDED_SIDE_OF_CCW_CIRCLE_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_weight_2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_weight_2.h
index 52631c37dbe..5c97dc2744e 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_weight_2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_weight_2.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef CGAL_AG2_COMPARE_WEIGHT_2_H
-#define CGAL_AG2_COMPARE_WEIGHT_2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_COMPARE_WEIGHT_2_H
+#define CGAL_APOLLONIUS_GRAPH_2_COMPARE_WEIGHT_2_H
 
 #include <CGAL/enum.h>
 
@@ -50,4 +50,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_COMPARE_WEIGHT_2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_WEIGHT_2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_x_2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_x_2.h
index d02f63993f5..a1811f97178 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_x_2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_x_2.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef CGAL_AG2_COMPARE_X_2_H
-#define CGAL_AG2_COMPARE_X_2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_COMPARE_X_2_H
+#define CGAL_APOLLONIUS_GRAPH_2_COMPARE_X_2_H
 
 #include <CGAL/enum.h>
 
@@ -50,4 +50,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_COMPARE_X_2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_X_2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_y_2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_y_2.h
index eebaf9510e8..4d59d240b13 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_y_2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_compare_y_2.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef CGAL_AG2_COMPARE_Y_2_H
-#define CGAL_AG2_COMPARE_Y_2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_COMPARE_Y_2_H
+#define CGAL_APOLLONIUS_GRAPH_2_COMPARE_Y_2_H
 
 #include <CGAL/enum.h>
 
@@ -50,4 +50,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_COMPARE_Y_2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_Y_2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_finite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_finite_edge_test_C2.h
index 1a20e82c9e4..68a16444b4b 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_finite_edge_test_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_finite_edge_test_C2.h
@@ -19,16 +19,16 @@
 
 
 
-#ifndef CGAL_AG2_FINITE_EDGE_TEST_C2_H
-#define CGAL_AG2_FINITE_EDGE_TEST_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_TEST_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_TEST_C2_H
 
 #include <CGAL/enum.h>
 #include <CGAL/Number_type_traits.h>
 
-#include <CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h>
+#include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
 #include <CGAL/functions_on_signs.h>
-#include <CGAL/predicates/compare_quadratic.h>
+#include <CGAL/Apollonius_graph_2/compare_quadratic.h>
 
 CGAL_BEGIN_NAMESPACE
 
@@ -617,4 +617,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_FINITE_EDGE_TEST_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_FINITE_EDGE_TEST_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_incircle_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_incircle_C2.h
index 5d4a3a44715..8bce19b6f92 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_incircle_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_incircle_C2.h
@@ -19,15 +19,15 @@
 
 
 
-#ifndef CGAL_AG2_INCIRCLE_C2_H
-#define CGAL_AG2_INCIRCLE_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_INCIRCLE_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_INCIRCLE_C2_H
 
 #include <CGAL/enum.h>
 #include <CGAL/Number_type_traits.h>
 
-#include <CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h>
+#include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
-#include <CGAL/predicates/Ag2_bounded_side_of_ccw_circle_C2.h>
+#include <CGAL/Apollonius_graph_2/Bounded_side_of_ccw_circle_C2.h>
 
 
 CGAL_BEGIN_NAMESPACE
@@ -235,4 +235,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_INCIRCLE_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_INCIRCLE_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_infinite_edge_test_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_infinite_edge_test_C2.h
index ed591b252fd..1eccf1f7a17 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_infinite_edge_test_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_infinite_edge_test_C2.h
@@ -19,14 +19,14 @@
 
 
 
-#ifndef CGAL_AG2_INFINITE_EDGE_TEST_C2_H
-#define CGAL_AG2_INFINITE_EDGE_TEST_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_INFINITE_EDGE_TEST_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_INFINITE_EDGE_TEST_C2_H
 
 #include <CGAL/determinant.h>
 #include <CGAL/enum.h>
 #include <CGAL/Number_type_traits.h>
 
-#include <CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h>
+#include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
 
 CGAL_BEGIN_NAMESPACE
@@ -314,4 +314,4 @@ public:
 CGAL_END_NAMESPACE
 
 
-#endif // CGAL_AG2_INFINITE_EDGE_TEST_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_INFINITE_EDGE_TEST_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_degenerate_edge_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_degenerate_edge_C2.h
index 3f967c7afbd..2f400bd849e 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_degenerate_edge_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_degenerate_edge_C2.h
@@ -19,13 +19,13 @@
 
 
 
-#ifndef CGAL_AG2_IS_DEGENERATE_EDGE_C2_H
-#define CGAL_AG2_IS_DEGENERATE_EDGE_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_IS_DEGENERATE_EDGE_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_IS_DEGENERATE_EDGE_C2_H
 
-#include <CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h>
+#include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
-#include <CGAL/predicates/Ag2_incircle_C2.h>
-#include <CGAL/predicates/Ag2_finite_edge_test_C2.h>
+#include <CGAL/Apollonius_graph_2/Incircle_C2.h>
+#include <CGAL/Apollonius_graph_2/Finite_edge_test_C2.h>
 
 CGAL_BEGIN_NAMESPACE
 
@@ -88,4 +88,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_IS_DEGENERATE_EDGE_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_IS_DEGENERATE_EDGE_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_hidden_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_hidden_C2.h
index 1964772e23c..b6360075aa9 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_hidden_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_is_hidden_C2.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef CGAL_AG2_IS_HIDDEN_C2_H
-#define CGAL_AG2_IS_HIDDEN_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_IS_HIDDEN_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_IS_HIDDEN_C2_H
 
 #include <CGAL/enum.h>
 #include <CGAL/Number_type_traits.h>
@@ -83,4 +83,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_IS_HIDDEN_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_IS_HIDDEN_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_orientation_2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_orientation_2.h
index 2e10ae8594a..4127f83a74e 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_orientation_2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_orientation_2.h
@@ -19,12 +19,12 @@
 
 
 
-#ifndef CGAL_AG2_ORIENTATION_2_H
-#define CGAL_AG2_ORIENTATION_2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_ORIENTATION_2_H
+#define CGAL_APOLLONIUS_GRAPH_2_ORIENTATION_2_H
 
 #include <CGAL/enum.h>
 #include <CGAL/Number_type_traits.h>
-#include <CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h>
+#include <CGAL/Apollonius_graph_2/Predicate_constructions_C2.h>
 
 //--------------------------------------------------------------------
 
@@ -106,4 +106,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_ORIENTATION_2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTATION_2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h
index 49c0c9a365c..89d918ca2da 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef CGAL_AG2_ORIENTED_SIDE_OF_BISECTOR_C2_H
-#define CGAL_AG2_ORIENTED_SIDE_OF_BISECTOR_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_ORIENTED_SIDE_OF_BISECTOR_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_ORIENTED_SIDE_OF_BISECTOR_C2_H
 
 #include <CGAL/enum.h>
 #include <CGAL/Number_type_traits.h>
@@ -119,4 +119,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_ORIENTED_SIDE_OF_BISECTOR_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_ORIENTED_SIDE_OF_BISECTOR_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_ftC2.h b/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_ftC2.h
index e7fc9daae8a..1be7b77b1bc 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_ftC2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_ftC2.h
@@ -26,11 +26,11 @@
 #include <CGAL/enum.h>
 #include <CGAL/Simple_cartesian.h>
 
-#include <CGAL/predicates/check_filter.h>
+#include <CGAL/Apollonius_graph_2/check_filter.h>
 #include <CGAL/functions_on_signs.h>
-#include <CGAL/predicates/Apollonius_graph_predicates_C2.h>
+#include <CGAL/Apollonius_graph_2/Predicates_C2.h>
 
-#include <CGAL/Apollonius_graph_kernel_wrapper_2.h>
+#include <CGAL/Apollonius_graph_2/Kernel_wrapper_2.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h
index 3e8a82d2bf2..fcd7256c35f 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicate_constructions_C2.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef CGAL_APOLLONIUS_GRAPH_PREDICATE_CONSTRUCTIONS_C2_H
-#define CGAL_APOLLONIUS_GRAPH_PREDICATE_CONSTRUCTIONS_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_PREDICATE_CONSTRUCTIONS_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_PREDICATE_CONSTRUCTIONS_C2_H
 
 
 CGAL_BEGIN_NAMESPACE
@@ -356,4 +356,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif  // CGAL_APOLLONIUS_GRAPH_PREDICATE_CONSTRUCTIONS_C2_H
+#endif  // CGAL_APOLLONIUS_GRAPH_2_PREDICATE_CONSTRUCTIONS_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h b/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h
index 9e60b958b07..08f926de950 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/Apollonius_graph_predicates_C2.h
@@ -19,19 +19,19 @@
 
 
 
-#ifndef CGAL_APOLLONIUS_GRAPH_PREDICATES_C2_H
-#define CGAL_APOLLONIUS_GRAPH_PREDICATES_C2_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_PREDICATES_C2_H
+#define CGAL_APOLLONIUS_GRAPH_2_PREDICATES_C2_H
 
-#include <CGAL/predicates/Ag2_compare_x_2.h>
-#include <CGAL/predicates/Ag2_compare_y_2.h>
-#include <CGAL/predicates/Ag2_compare_weight_2.h>
-#include <CGAL/predicates/Ag2_orientation_2.h>
-#include <CGAL/predicates/Ag2_is_hidden_C2.h>
-#include <CGAL/predicates/Ag2_oriented_side_of_bisector_C2.h>
-#include <CGAL/predicates/Ag2_incircle_C2.h>
-#include <CGAL/predicates/Ag2_finite_edge_test_C2.h>
-#include <CGAL/predicates/Ag2_infinite_edge_test_C2.h>
-#include <CGAL/predicates/Ag2_is_degenerate_edge_C2.h>
+#include <CGAL/Apollonius_graph_2/Compare_x_2.h>
+#include <CGAL/Apollonius_graph_2/Compare_y_2.h>
+#include <CGAL/Apollonius_graph_2/Compare_weight_2.h>
+#include <CGAL/Apollonius_graph_2/Orientation_2.h>
+#include <CGAL/Apollonius_graph_2/Is_hidden_C2.h>
+#include <CGAL/Apollonius_graph_2/Oriented_side_of_bisector_C2.h>
+#include <CGAL/Apollonius_graph_2/Incircle_C2.h>
+#include <CGAL/Apollonius_graph_2/Finite_edge_test_C2.h>
+#include <CGAL/Apollonius_graph_2/Infinite_edge_test_C2.h>
+#include <CGAL/Apollonius_graph_2/Is_degenerate_edge_C2.h>
 
 
-#endif // CGAL_APOLLONIUS_GRAPH_PREDICATES_C2_H
+#endif // CGAL_APOLLONIUS_GRAPH_2_PREDICATES_C2_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/compare_quadratic.h b/Apollonius_graph_2/include/CGAL/predicates/compare_quadratic.h
index fe4d0fce17a..fe128e56def 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/compare_quadratic.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/compare_quadratic.h
@@ -19,15 +19,15 @@
 
 
 
-#ifndef CGAL_COMPARE_QUADRATIC_H
-#define CGAL_COMPARE_QUADRATIC_H
+#ifndef CGAL_APOLLONIUS_GRAPH_2_COMPARE_QUADRATIC_H
+#define CGAL_APOLLONIUS_GRAPH_2_COMPARE_QUADRATIC_H
 
 #include <CGAL/functions_on_signs.h>
 
 CGAL_BEGIN_NAMESPACE
 
 #ifdef COMPARATOR_PROFILER
-#include <CGAL/predicates/comparator_profiler.h>
+#include <CGAL/Apollonius_graph_2/comparator_profiler.h>
 #endif
 
 
@@ -1011,4 +1011,4 @@ CGAL_END_NAMESPACE
 #endif // CGAL_ARITHMETIC_FILTER_H
 
 
-#endif // CGAL_COMPARE_QUADRATIC
+#endif // CGAL_APOLLONIUS_GRAPH_2_COMPARE_QUADRATIC_H
diff --git a/Apollonius_graph_2/include/CGAL/predicates/predicate_profiler.h b/Apollonius_graph_2/include/CGAL/predicates/predicate_profiler.h
index 1c256b272c5..9ec8a353096 100644
--- a/Apollonius_graph_2/include/CGAL/predicates/predicate_profiler.h
+++ b/Apollonius_graph_2/include/CGAL/predicates/predicate_profiler.h
@@ -19,8 +19,8 @@
 
 
 
-#ifndef CGAL_AG2_PREDICATE_PROFILER
-#define CGAL_AG2_PREDICATE_PROFILER
+#ifndef CGAL_APOLLONIUS_GRAPH_2_PREDICATE_PROFILER
+#define CGAL_APOLLONIUS_GRAPH_2_PREDICATE_PROFILER
 
 #define AG2_PROFILE_PREDICATES
 
@@ -69,4 +69,4 @@ unsigned long ag2_predicate_profiler::order_on_bisector_counter = 0;
 
 CGAL_END_NAMESPACE
 
-#endif // CGAL_AG2_PREDICATE_PROFILER
+#endif // CGAL_APOLLONIUS_GRAPH_2_PREDICATE_PROFILER