diff --git a/Alpha_shapes_3/doc/Alpha_shapes_3/Doxyfile.in b/Alpha_shapes_3/doc/Alpha_shapes_3/Doxyfile.in
index 6fe61e68211..76909d608fa 100644
--- a/Alpha_shapes_3/doc/Alpha_shapes_3/Doxyfile.in
+++ b/Alpha_shapes_3/doc/Alpha_shapes_3/Doxyfile.in
@@ -2,5 +2,4 @@
 
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 3D Alpha Shapes"
 
-EXAMPLE_PATH =  ${CGAL_Alpha_shapes_2_EXAMPLE_DIR} \
-                ${CGAL_Alpha_shapes_3_EXAMPLE_DIR}
+EXAMPLE_PATH +=  ${CGAL_Alpha_shapes_2_EXAMPLE_DIR}
diff --git a/BGL/doc/BGL/Doxyfile.in b/BGL/doc/BGL/Doxyfile.in
index 970bf3ffa8b..4e5d35a91d2 100644
--- a/BGL/doc/BGL/Doxyfile.in
+++ b/BGL/doc/BGL/Doxyfile.in
@@ -21,13 +21,12 @@ INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/Euler_operations.h \
          ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/graph_traits_inheritance_macros.h
 
 
-EXAMPLE_PATH               =  ${CGAL_Surface_mesh_skeletonization_EXAMPLE_DIR} \
-                              ${CGAL_Surface_mesh_segmentation_EXAMPLE_DIR} \
-                              ${CGAL_Polygon_mesh_processing_EXAMPLE_DIR} \
-                              ${CGAL_Surface_mesh_EXAMPLE_DIR} \
-                              ${CGAL_Property_map_EXAMPLE_DIR} \
-                              ${CGAL_Polyhedron_EXAMPLE_DIR} \
-                              ${CGAL_BGL_EXAMPLE_DIR}
+EXAMPLE_PATH               +=  ${CGAL_Surface_mesh_skeletonization_EXAMPLE_DIR} \
+                               ${CGAL_Surface_mesh_segmentation_EXAMPLE_DIR} \
+                               ${CGAL_Polygon_mesh_processing_EXAMPLE_DIR} \
+                               ${CGAL_Surface_mesh_EXAMPLE_DIR} \
+                               ${CGAL_Property_map_EXAMPLE_DIR} \
+                               ${CGAL_Polyhedron_EXAMPLE_DIR}
 
 ALIASES +=  "bgllink{1}=<a href=\"http://www.boost.org/libs/graph/doc/\1.html\"><code>\1</code></a>"
 
diff --git a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Doxyfile.in b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Doxyfile.in
index 8d17ef5c0b8..c97e9fc5008 100644
--- a/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Doxyfile.in
+++ b/Hyperbolic_triangulation_2/doc/Hyperbolic_triangulation_2/Doxyfile.in
@@ -2,8 +2,6 @@
 
 EXTRACT_PRIVATE = NO
 
-EXAMPLE_PATH = ${CGAL_PACKAGE_DIR}/examples
-
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 2D Hyperbolic Delaunay Triangulations"
 
 HTML_EXTRA_STYLESHEET = ${CGAL_PACKAGE_DOC_DIR}/css/customstyle.css
diff --git a/Mesh_3/doc/Mesh_3/Doxyfile.in b/Mesh_3/doc/Mesh_3/Doxyfile.in
index 62ea73403e6..c5f22c38811 100644
--- a/Mesh_3/doc/Mesh_3/Doxyfile.in
+++ b/Mesh_3/doc/Mesh_3/Doxyfile.in
@@ -23,4 +23,4 @@ HTML_EXTRA_FILES           =  ${CGAL_PACKAGE_DOC_DIR}/fig/implicit_domain_3.jpg
                               ${CGAL_PACKAGE_DOC_DIR}/fig/protection-complex.png \
                               ${CGAL_PACKAGE_DOC_DIR}/fig/no-protection-complex.png
 
-EXAMPLE_PATH += ${CGAL_PACKAGE_INCLUDE_DIR}
+EXAMPLE_PATH += ${CGAL_PACKAGE_INCLUDE_DIR} # non-documented headers are advertised
diff --git a/Orthtree/doc/Orthtree/Doxyfile.in b/Orthtree/doc/Orthtree/Doxyfile.in
index 49945a16c84..980e12e8f6e 100644
--- a/Orthtree/doc/Orthtree/Doxyfile.in
+++ b/Orthtree/doc/Orthtree/Doxyfile.in
@@ -5,5 +5,3 @@ PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - Quadtrees, Octrees, and Orthtrees"
 EXTRACT_ALL                =  false
 HIDE_UNDOC_MEMBERS         =  true
 HIDE_UNDOC_CLASSES         =  true
-
-EXAMPLE_PATH               =  ${CGAL_PACKAGE_DIR}/examples
diff --git a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Doxyfile.in b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Doxyfile.in
index b4db01df482..d49050978bf 100644
--- a/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Doxyfile.in
+++ b/Periodic_3_mesh_3/doc/Periodic_3_mesh_3/Doxyfile.in
@@ -1,7 +1,6 @@
 @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
 
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 3D Periodic Mesh Generation"
-EXAMPLE_PATH += ${CGAL_PACKAGE_INCLUDE_DIR}
 EXTRACT_ALL                =  false
 HIDE_UNDOC_CLASSES         =  true
 WARN_IF_UNDOCUMENTED       =  false
diff --git a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Doxyfile.in b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Doxyfile.in
index b7edd8e9ac9..6de78d75066 100644
--- a/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Doxyfile.in
+++ b/Periodic_4_hyperbolic_triangulation_2/doc/Periodic_4_hyperbolic_triangulation_2/Doxyfile.in
@@ -1,7 +1,5 @@
 @INCLUDE 				= ${CGAL_DOC_PACKAGE_DEFAULTS}
 
-EXAMPLE_PATH 			= ${CGAL_PACKAGE_DIR}/examples
-
 EXTRACT_ALL  			= YES
 EXTRACT_LOCAL_CLASSES  	= YES
 INHERIT_DOCS           	= YES
diff --git a/Polygon/doc/Polygon/Doxyfile.in b/Polygon/doc/Polygon/Doxyfile.in
index 8cfb32b528f..5b7caa6808a 100644
--- a/Polygon/doc/Polygon/Doxyfile.in
+++ b/Polygon/doc/Polygon/Doxyfile.in
@@ -1,8 +1,7 @@
 @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
 
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - 2D Polygons"
-EXAMPLE_PATH = ${CGAL_PACKAGE_DIR}/examples \
-               ${CGAL_Stream_support_EXAMPLE_DIR}
+EXAMPLE_PATH += ${CGAL_Stream_support_EXAMPLE_DIR}
 
 EXTRACT_ALL                =  false
 HIDE_UNDOC_MEMBERS         =  true
diff --git a/Stream_support/doc/Stream_support/Doxyfile.in b/Stream_support/doc/Stream_support/Doxyfile.in
index f0c48c2e204..31fdc18aeef 100644
--- a/Stream_support/doc/Stream_support/Doxyfile.in
+++ b/Stream_support/doc/Stream_support/Doxyfile.in
@@ -1,7 +1,6 @@
 @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
 
 PROJECT_NAME = "CGAL ${CGAL_DOC_VERSION} - IO Streams"
-EXAMPLE_PATH = ${CGAL_PACKAGE_DIR}/examples
 
 EXTRACT_ALL                =  false
 HIDE_UNDOC_MEMBERS         =  true
diff --git a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in
index 59dccb4ff04..a3841240c16 100644
--- a/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in
+++ b/Tetrahedral_remeshing/doc/Tetrahedral_remeshing/Doxyfile.in
@@ -6,6 +6,4 @@ EXTRACT_ALL          = false
 HIDE_UNDOC_CLASSES   = true
 WARN_IF_UNDOCUMENTED = false
 
-EXAMPLE_PATH += ${CGAL_Tetrahedral_remeshing_EXAMPLE_DIR}
-
 EXCLUDE = ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/Tetrahedral_remeshing/internal