diff --git a/Convex_hull_2/include/CGAL/ch_akl_toussaint.C b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h
similarity index 96%
rename from Convex_hull_2/include/CGAL/ch_akl_toussaint.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h
index 2d4509a9066..744f7cfc9c5 100644
--- a/Convex_hull_2/include/CGAL/ch_akl_toussaint.C
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_akl_toussaint_impl.h
@@ -21,15 +21,11 @@
 #ifndef CGAL_CH_AKL_TOUSSAINT_C
 #define CGAL_CH_AKL_TOUSSAINT_C
 
-#ifndef CGAL_CH_AKL_TOUSSAINT_H
-#include <CGAL/ch_akl_toussaint.h>
-#endif // CGAL_CH_AKL_TOUSSAINT_H
-
 #ifndef CGAL_CH_NO_POSTCONDITIONS
-#include <CGAL/convexity_check_2.h>
+#include <CGAL/Convex_hull_2/convexity_check_2.h>
 #endif // CGAL_CH_NO_POSTCONDITIONS
 
-#include <CGAL/ch_assertions.h>
+#include <CGAL/Convex_hull_2/ch_assertions.h>
 #include <CGAL/ch_selected_extreme_points_2.h>
 #include <CGAL/ch_graham_andrew.h>
 #include <CGAL/algorithm.h>
diff --git a/Convex_hull_2/include/CGAL/ch_assertions.h b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_assertions.h
similarity index 100%
rename from Convex_hull_2/include/CGAL/ch_assertions.h
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_assertions.h
diff --git a/Convex_hull_2/include/CGAL/ch_bykat.C b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h
similarity index 98%
rename from Convex_hull_2/include/CGAL/ch_bykat.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h
index 9fd9356cfe3..916b94900d6 100644
--- a/Convex_hull_2/include/CGAL/ch_bykat.C
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h
@@ -21,15 +21,11 @@
 #ifndef CGAL_CH_BYKAT_C
 #define CGAL_CH_BYKAT_C
 
-#ifndef CGAL_CH_BYKAT_H
-#include <CGAL/ch_bykat.h>
-#endif // CGAL_CH_BYKAT_H
-
 #ifndef CGAL_CH_NO_POSTCONDITIONS
-#include <CGAL/convexity_check_2.h>
+#include <CGAL/Convex_hull_2/convexity_check_2.h>
 #endif // CGAL_CH_NO_POSTCONDITIONS
 
-#include <CGAL/ch_assertions.h>
+#include <CGAL/Convex_hull_2/ch_assertions.h>
 #include <CGAL/ch_selected_extreme_points_2.h>
 #include <CGAL/ch_graham_andrew.h>
 #include <CGAL/algorithm.h>
diff --git a/Convex_hull_2/include/CGAL/ch_eddy.C b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h
similarity index 96%
rename from Convex_hull_2/include/CGAL/ch_eddy.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h
index 593b912e20d..1f9ead72e69 100644
--- a/Convex_hull_2/include/CGAL/ch_eddy.C
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_eddy_impl.h
@@ -21,15 +21,11 @@
 #ifndef CGAL_CH_EDDY_C
 #define CGAL_CH_EDDY_C
 
-#ifndef CGAL_CH_EDDY_H
-#include <CGAL/ch_eddy.h>
-#endif // CGAL_CH_EDDY_H
-
 #ifndef CGAL_CH_NO_POSTCONDITIONS
-#include <CGAL/convexity_check_2.h>
+#include <CGAL/Convex_hull_2/convexity_check_2.h>
 #endif // CGAL_CH_NO_POSTCONDITIONS
 
-#include <CGAL/ch_assertions.h>
+#include <CGAL/Convex_hull_2/ch_assertions.h>
 #include <CGAL/ch_selected_extreme_points_2.h>
 #include <CGAL/algorithm.h>
 #include <CGAL/functional.h>
diff --git a/Convex_hull_2/include/CGAL/ch_graham_andrew.C b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h
similarity index 98%
rename from Convex_hull_2/include/CGAL/ch_graham_andrew.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h
index a471250984d..344712e8bce 100644
--- a/Convex_hull_2/include/CGAL/ch_graham_andrew.C
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_graham_andrew_impl.h
@@ -21,15 +21,11 @@
 #ifndef CGAL_CH_GRAHAM_ANDREW_C
 #define CGAL_CH_GRAHAM_ANDREW_C
 
-#ifndef CGAL_CH_GRAHAM_ANDREW_H
-#include <CGAL/ch_graham_andrew.h>
-#endif // CGAL_CH_GRAHAM_ANDREW_H
-
 #ifndef CGAL_CH_NO_POSTCONDITIONS
-#include <CGAL/convexity_check_2.h>
+#include <CGAL/Convex_hull_2/convexity_check_2.h>
 #endif // CGAL_CH_NO_POSTCONDITIONS
 
-#include <CGAL/ch_assertions.h>
+#include <CGAL/Convex_hull_2/ch_assertions.h>
 #include <CGAL/algorithm.h>
 #include <CGAL/IO/Tee_for_output_iterator.h>
 #include <vector>
diff --git a/Convex_hull_2/include/CGAL/ch_jarvis.C b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h
similarity index 95%
rename from Convex_hull_2/include/CGAL/ch_jarvis.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h
index b86b0540b5a..a4b425b48c3 100644
--- a/Convex_hull_2/include/CGAL/ch_jarvis.C
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h
@@ -21,21 +21,15 @@
 #ifndef CGAL_CH_JARVIS_C
 #define CGAL_CH_JARVIS_C
 
-#ifndef CGAL_CH_JARVIS_H
-#include <CGAL/ch_jarvis.h>
-#endif // CGAL_CH_JARVIS_H
-
 #ifndef CGAL_CH_NO_POSTCONDITIONS
-#include <CGAL/convexity_check_2.h>
+#include <CGAL/Convex_hull_2/convexity_check_2.h>
 #endif // CGAL_CH_NO_POSTCONDITIONS
 
-#include <CGAL/ch_assertions.h>
+#include <CGAL/Convex_hull_2/ch_assertions.h>
 #include <CGAL/ch_selected_extreme_points_2.h>
 #include <CGAL/functional.h>
-#include <CGAL/ch_selected_extreme_points_2.h>
 #include <algorithm>
 
-
 CGAL_BEGIN_NAMESPACE
 template <class ForwardIterator, class OutputIterator, 
           class Point, class Traits>
diff --git a/Convex_hull_2/include/CGAL/ch_melkman.C b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_melkman_impl.h
similarity index 96%
rename from Convex_hull_2/include/CGAL/ch_melkman.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_melkman_impl.h
index 524c080ac0b..5d17b7d0815 100644
--- a/Convex_hull_2/include/CGAL/ch_melkman.C
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_melkman_impl.h
@@ -22,15 +22,11 @@
 #ifndef CGAL_CH_MELKMAN_C
 #define CGAL_CH_MELKMAN_C
 
-#ifndef CGAL_CH_MELKMAN_H
-#include <CGAL/ch_melkman.h>
-#endif
-
 #ifndef CGAL_CH_NO_POSTCONDITIONS
-#include <CGAL/convexity_check_2.h>
+#include <CGAL/Convex_hull_2/convexity_check_2.h>
 #endif // CGAL_CH_NO_POSTCONDITIONS
 
-#include <CGAL/ch_assertions.h>
+#include <CGAL/Convex_hull_2/ch_assertions.h>
 #include <queue>
 #include <iterator>
 
diff --git a/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.C b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h
similarity index 96%
rename from Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h
index 7cf8e398a5d..d7d79574cfe 100644
--- a/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.C
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h
@@ -21,12 +21,8 @@
 #ifndef CGAL_CH_SELECTED_EXTREME_POINTS_2_C
 #define CGAL_CH_SELECTED_EXTREME_POINTS_2_C
 
-#ifndef CGAL_CH_SELECTED_EXTREME_POINTS_2_H
-#include <CGAL/ch_selected_extreme_points_2.h>
-#endif // CGAL_CH_SELECTED_EXTREME_POINTS_2_H
-
 #ifndef CGAL_CH_NO_POSTCONDITIONS
-#include <CGAL/convexity_check_2.h>
+#include <CGAL/Convex_hull_2/convexity_check_2.h>
 #endif // CGAL_CH_NO_POSTCONDITIONS
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Convex_hull_2/include/CGAL/convexity_check_2.h b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2.h
similarity index 97%
rename from Convex_hull_2/include/CGAL/convexity_check_2.h
rename to Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2.h
index 2157d0ae172..9f4f334f123 100644
--- a/Convex_hull_2/include/CGAL/convexity_check_2.h
+++ b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2.h
@@ -124,9 +124,7 @@ ch_brute_force_chain_check_2(ForwardIterator1 first1, ForwardIterator1 last1,
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/convexity_check_2.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/convexity_check_2_impl.h>
 
 #endif // CGAL_CONVEXITY_CHECK_2_H
 
diff --git a/Convex_hull_2/include/CGAL/convexity_check_2.C b/Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h
similarity index 100%
rename from Convex_hull_2/include/CGAL/convexity_check_2.C
rename to Convex_hull_2/include/CGAL/Convex_hull_2/convexity_check_2_impl.h
diff --git a/Convex_hull_2/include/CGAL/ch_akl_toussaint.h b/Convex_hull_2/include/CGAL/ch_akl_toussaint.h
index 52eda8b1234..cbd16679cb3 100644
--- a/Convex_hull_2/include/CGAL/ch_akl_toussaint.h
+++ b/Convex_hull_2/include/CGAL/ch_akl_toussaint.h
@@ -50,9 +50,7 @@ ch_akl_toussaint(ForwardIterator first, ForwardIterator last,
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/ch_akl_toussaint.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/ch_akl_toussaint_impl.h>
 
 #endif // CGAL_CH_AKL_TOUSSAINT_H
 
diff --git a/Convex_hull_2/include/CGAL/ch_bykat.h b/Convex_hull_2/include/CGAL/ch_bykat.h
index 42e3b363a25..fe0e2786695 100644
--- a/Convex_hull_2/include/CGAL/ch_bykat.h
+++ b/Convex_hull_2/include/CGAL/ch_bykat.h
@@ -69,9 +69,7 @@ ch_bykat_with_threshold(InputIterator first, InputIterator last,
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/ch_bykat.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/ch_bykat_impl.h>
 
 #endif // CGAL_CH_BYKAT_H
 
diff --git a/Convex_hull_2/include/CGAL/ch_eddy.h b/Convex_hull_2/include/CGAL/ch_eddy.h
index c7be7e7e8ca..4ad0123bb16 100644
--- a/Convex_hull_2/include/CGAL/ch_eddy.h
+++ b/Convex_hull_2/include/CGAL/ch_eddy.h
@@ -49,9 +49,7 @@ ch_eddy(InputIterator first, InputIterator last, OutputIterator  result)
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/ch_eddy.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/ch_eddy_impl.h>
 
 #endif // CGAL_CH_EDDY_H
 
diff --git a/Convex_hull_2/include/CGAL/ch_graham_andrew.h b/Convex_hull_2/include/CGAL/ch_graham_andrew.h
index de632339e40..71dc2ba265b 100644
--- a/Convex_hull_2/include/CGAL/ch_graham_andrew.h
+++ b/Convex_hull_2/include/CGAL/ch_graham_andrew.h
@@ -107,9 +107,7 @@ ch_upper_hull_scan( InputIterator  first,
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/ch_graham_andrew.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/ch_graham_andrew_impl.h>
 
 #endif // CGAL_CH_GRAHAM_ANDREW_H
 
diff --git a/Convex_hull_2/include/CGAL/ch_jarvis.h b/Convex_hull_2/include/CGAL/ch_jarvis.h
index 17024d17d44..a946825e7c0 100644
--- a/Convex_hull_2/include/CGAL/ch_jarvis.h
+++ b/Convex_hull_2/include/CGAL/ch_jarvis.h
@@ -83,9 +83,7 @@ ch_jarvis(ForwardIterator first, ForwardIterator last, OutputIterator  result)
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/ch_jarvis.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/ch_jarvis_impl.h>
 
 #endif // CGAL_CH_JARVIS_H
 
diff --git a/Convex_hull_2/include/CGAL/ch_melkman.h b/Convex_hull_2/include/CGAL/ch_melkman.h
index ed44a28fb83..eb3ece9279b 100644
--- a/Convex_hull_2/include/CGAL/ch_melkman.h
+++ b/Convex_hull_2/include/CGAL/ch_melkman.h
@@ -45,9 +45,7 @@ ch_melkman( InputIterator first, InputIterator last,  OutputIterator result)
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/ch_melkman.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/ch_melkman_impl.h>
 
 #endif // CGAL_CH_MELKMAN_H
 
diff --git a/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h b/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h
index ef91d9de1a2..b686357bdef 100644
--- a/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h
+++ b/Convex_hull_2/include/CGAL/ch_selected_extreme_points_2.h
@@ -208,9 +208,7 @@ ch_w_point( ForwardIterator first, ForwardIterator last, ForwardIterator& w)
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#include <CGAL/ch_selected_extreme_points_2.C>
-#endif // CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
+#include <CGAL/Convex_hull_2/ch_selected_extreme_points_2_impl.h>
 
 #endif // CGAL_CH_SELECTED_EXTREME_POINTS_2_H