diff --git a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h
index 01c0a5f1350..ebd8c7610d2 100644
--- a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h
+++ b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_2.h
@@ -166,9 +166,7 @@ private:
 
 CGAL_END_NAMESPACE
 
-#ifdef CGAL_CFG_NO_AUTOMATIC_TEMPLATE_INCLUSION
-#  include <CGAL/Polygon_offset_builder_2.C>
-#endif
+#include <CGAL/Straight_skeleton_2/Polygon_offset_builder_2_impl.h>
 
 #endif // CGAL_POLYGON_OFFSET_BUILDER_2_H //
 // EOF //
diff --git a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h
index 64def79d717..d6102202fcc 100644
--- a/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h
+++ b/Straight_skeleton_2/include/CGAL/Polygon_offset_builder_traits_2.h
@@ -17,7 +17,7 @@
 #ifndef CGAL_POLYGON_OFFSET_BUILDER_TRAITS_2_H
 #define CGAL_POLYGON_OFFSET_BUILDER_TRAITS_2_H 1
 
-#include <CGAL/Straight_skeleton_builder_traits_2_aux.h>
+#include <CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h>
 #include <CGAL/predicates/Polygon_offset_pred_ftC2.h>
 #include <CGAL/constructions/Polygon_offset_cons_ftC2.h>
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
index 3c12e8ca53c..818c80472a3 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_2.h
@@ -29,10 +29,10 @@
 #include <boost/shared_ptr.hpp>
 
 #include <CGAL/algorithm.h>
-#include <CGAL/Straight_skeleton_aux.h>
+#include <CGAL/Straight_skeleton_2/Straight_skeleton_aux.h>
+#include <CGAL/Straight_skeleton_2/Straight_skeleton_builder_events_2.h>
 #include <CGAL/Straight_skeleton_2.h>
 #include <CGAL/Straight_skeleton_builder_traits_2.h>
-#include <CGAL/Straight_skeleton_builder_events_2.h>
 #include <CGAL/HalfedgeDS_const_decorator.h>
 #include <CGAL/enum.h>
 
diff --git a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h
index c7c1dacf256..f5e89015765 100644
--- a/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h
+++ b/Straight_skeleton_2/include/CGAL/Straight_skeleton_builder_traits_2.h
@@ -18,8 +18,8 @@
 #ifndef CGAL_STRAIGHT_SKELETON_BUILDER_TRAITS_2_H
 #define CGAL_STRAIGHT_SKELETON_BUILDER_TRAITS_2_H 1
 
-#include <CGAL/Straight_skeleton_aux.h>
-#include <CGAL/Straight_skeleton_builder_traits_2_aux.h>
+#include <CGAL/Straight_skeleton_2/Straight_skeleton_aux.h>
+#include <CGAL/Straight_skeleton_2/Straight_skeleton_builder_traits_2_aux.h>
 #include <CGAL/predicates/Straight_skeleton_pred_ftC2.h>
 #include <CGAL/constructions/Straight_skeleton_cons_ftC2.h>