diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp
index cb1e6d6dce6..495640ba7a9 100644
--- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp
+++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_basic.cpp
@@ -3,7 +3,7 @@
 #include <CGAL/Point_with_normal_3.h>
 #include <CGAL/property_map.h>
 
-#include <CGAL/Shape_detection_3/Efficient_RANSAC.h>
+#include <CGAL/Shape_detection_3.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
index 032eb211d56..72b8ec9bb78 100644
--- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
+++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
@@ -4,7 +4,7 @@
 #include <CGAL/property_map.h>
 #include <CGAL/Timer.h> 
 
-#include <CGAL/Shape_detection_3/Efficient_RANSAC.h>
+#include <CGAL/Shape_detection_3.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp
index a851cd6060c..9d9d79caa16 100644
--- a/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp
+++ b/Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_point_access.cpp
@@ -5,7 +5,7 @@
 #include <CGAL/Timer.h>
 #include <CGAL/number_utils.h>
 
-#include <CGAL/Shape_detection_3/Efficient_RANSAC.h>
+#include <CGAL/Shape_detection_3.h>
 
 #include <iostream>
 #include <fstream>
diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h
index c23336d2f77..500e577cf0f 100644
--- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h
+++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3.h
@@ -30,6 +30,7 @@
 #define CGAL_SHAPE_DETECTION_3_H
 
 #include <CGAL/Shape_detection_3/Efficient_RANSAC.h>
+#include <CGAL/Shape_detection_3/Efficient_RANSAC_traits.h>
 #include <CGAL/Shape_detection_3/Plane.h>
 #include <CGAL/Shape_detection_3/Cylinder.h>
 #include <CGAL/Shape_detection_3/Cone.h>
diff --git a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
index 512cb6dd28d..d60eda1a94f 100644
--- a/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
+++ b/Point_set_shape_detection_3/include/CGAL/Shape_detection_3/Efficient_RANSAC.h
@@ -24,12 +24,6 @@
 
 #include <CGAL/Shape_detection_3/Octree.h>
 #include <CGAL/Shape_detection_3/Shape_base.h>
-#include <CGAL/Shape_detection_3/Efficient_RANSAC_traits.h>
-#include <CGAL/Shape_detection_3/Cone.h>
-#include <CGAL/Shape_detection_3/Cylinder.h>
-#include <CGAL/Shape_detection_3/Plane.h>
-#include <CGAL/Shape_detection_3/Sphere.h>
-#include <CGAL/Shape_detection_3/Torus.h>
 
 //for octree ------------------------------
 #include <boost/iterator/filter_iterator.hpp>