From f143463fc846fda8ea256f5fd46356edd5da4daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mael=20Rouxel-Labb=C3=A9?=
 <mael.rouxel.labbe@geometryfactory.com>
Date: Mon, 15 May 2017 17:51:37 +0200
Subject: [PATCH] Fixed some includes

---
 .../CGAL/Periodic_3_Delaunay_triangulation_traits_3.h    | 6 ++----
 .../include/CGAL/Periodic_3_regular_triangulation_3.h    | 2 +-
 .../CGAL/Periodic_3_regular_triangulation_traits_3.h     | 4 ++--
 .../include/CGAL/Periodic_3_triangulation_3.h            | 4 ++--
 .../include/CGAL/Periodic_3_triangulation_traits_3.h     | 9 +++++----
 ...Delaunay_triangulation_statically_filtered_traits_3.h | 1 +
 .../Periodic_3_regular_triangulation_remove_traits_3.h   | 4 ++++
 ..._regular_triangulation_statically_filtered_traits_3.h | 1 +
 ...riodic_3_triangulation_statically_filtered_traits_3.h | 1 +
 9 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h
index e239ec95ca1..f58c96ac338 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_Delaunay_triangulation_traits_3.h
@@ -25,11 +25,9 @@
 
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
-#include <CGAL/basic.h>
+#include <CGAL/internal/Periodic_3_construct_point_3.h>
+#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
 #include <CGAL/Periodic_3_offset_3.h>
-#include <CGAL/Traits_with_offsets_adaptor.h>
-#include <CGAL/Periodic_3_construct_point_3.h>
-#include <CGAL/internal/Has_boolean_tags.h>
 #include <CGAL/Periodic_3_triangulation_traits_3.h>
 
 namespace CGAL {
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
index 58699905471..67c4a091b32 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
@@ -706,7 +706,7 @@ public:
   }
 
 #define CGAL_INCLUDE_FROM_PERIODIC_3_REGULAR_TRIANGULATION_3_H
-#include <CGAL/Periodic_3_regular_triangulation_dummy_288.h>
+#include <CGAL/internal/Periodic_3_regular_triangulation_dummy_288.h>
 #undef CGAL_INCLUDE_FROM_PERIODIC_3_REGULAR_TRIANGULATION_3_H
 
   Vertex_handle nearest_power_vertex(const Bare_point& p, Cell_handle start) const
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h
index 9007c76f940..2f7abdd0c92 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_traits_3.h
@@ -25,9 +25,9 @@
 
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
+#include <CGAL/internal/Functor_with_offset_weighted_points_adaptor.h>
+#include <CGAL/internal/Periodic_3_construct_weighted_point_3.h>
 #include <CGAL/Periodic_3_offset_3.h>
-#include <CGAL/Regular_traits_with_offsets_adaptor.h>
-#include <CGAL/Periodic_3_construct_weighted_point_3.h>
 #include <CGAL/Periodic_3_triangulation_traits_3.h>
 
 #include <CGAL/basic.h>
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
index f19fe17f925..469223dd65a 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
@@ -44,7 +44,7 @@
 #include <CGAL/Triangulation_cell_base_3.h>
 #include <CGAL/Triangulation_vertex_base_3.h>
 
-#include <CGAL/Periodic_3_triangulation_iterators_3.h>
+#include <CGAL/internal/Periodic_3_triangulation_iterators_3.h>
 
 #include <CGAL/Unique_hash_map.h>
 
@@ -2750,7 +2750,7 @@ Periodic_3_triangulation_3<GT,TDS>::create_initial_triangulation(
   return vir_vertices[0][0][0];
 }
 #define CGAL_INCLUDE_FROM_PERIODIC_3_TRIANGULATION_3_H
-#include <CGAL/Periodic_3_triangulation_dummy_36.h>
+#include <CGAL/internal/Periodic_3_triangulation_dummy_36.h>
 #undef CGAL_INCLUDE_FROM_PERIODIC_3_TRIANGULATION_3_H
 
 /** finds all cells that are in conflict with the currently added point
diff --git a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h
index a7ac4df16ff..a166eb7d6ed 100644
--- a/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_traits_3.h
@@ -24,12 +24,13 @@
 
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
-#include <CGAL/basic.h>
+#include <CGAL/internal/Periodic_3_construct_point_3.h>
+#include <CGAL/internal/Functor_with_offset_points_adaptor.h>
 #include <CGAL/Periodic_3_offset_3.h>
-#include <CGAL/Periodic_3_construct_point_3.h>
-#include <CGAL/triangulation_assertions.h>
-#include <CGAL/Traits_with_offsets_adaptor.h>
+
+#include <CGAL/basic.h>
 #include <CGAL/internal/Has_boolean_tags.h>
+#include <CGAL/triangulation_assertions.h>
 
 namespace CGAL {
 
diff --git a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h
index 4b47150a2ad..8654c028170 100644
--- a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_Delaunay_triangulation_statically_filtered_traits_3.h
@@ -25,6 +25,7 @@
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
 #include <CGAL/internal/Static_filters/Periodic_3_side_of_oriented_sphere_3.h>
+#include <CGAL/internal/Periodic_3_Delaunay_triangulation_filtered_traits_3.h>
 
 namespace CGAL {
 
diff --git a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_remove_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_remove_traits_3.h
index b2803ac88e3..45c72e250a2 100644
--- a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_remove_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_remove_traits_3.h
@@ -27,6 +27,10 @@
 #include <CGAL/basic.h>
 #include <CGAL/Periodic_3_offset_3.h>
 
+#include <CGAL/internal/Periodic_3_Delaunay_triangulation_remove_traits_3.h>
+
+#include <utility>
+
 namespace CGAL
 {
 
diff --git a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h
index 1f64bb9d7b2..5f61f2e37dd 100644
--- a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_regular_triangulation_statically_filtered_traits_3.h
@@ -24,6 +24,7 @@
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
 #include <CGAL/internal/Static_filters/Periodic_3_power_side_of_oriented_power_sphere_3.h>
+#include <CGAL/internal/Periodic_3_regular_triangulation_filtered_traits_3.h>
 
 namespace CGAL {
 
diff --git a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_triangulation_statically_filtered_traits_3.h b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_triangulation_statically_filtered_traits_3.h
index ce4355fc9cb..70bcabee43a 100644
--- a/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_triangulation_statically_filtered_traits_3.h
+++ b/Periodic_3_triangulation_3/include/CGAL/internal/Periodic_3_triangulation_statically_filtered_traits_3.h
@@ -25,6 +25,7 @@
 #include <CGAL/license/Periodic_3_triangulation_3.h>
 
 #include <CGAL/internal/Static_filters/Periodic_3_orientation_3.h>
+#include <CGAL/internal/Periodic_3_triangulation_filtered_traits_3.h>
 
 namespace CGAL {