diff --git a/AABB_tree/doc/AABB_tree/doxygen.in b/AABB_tree/doc/AABB_tree/doxygen.in
index ffd9df690ed..4fb0e87ae7a 100644
--- a/AABB_tree/doc/AABB_tree/doxygen.in
+++ b/AABB_tree/doc/AABB_tree/doxygen.in
@@ -1,8 +1,11 @@
 @INCLUDE = ${CGAL_DOC_PACKAGE_DEFAULTS}
-INPUT                      =  ${CMAKE_SOURCE_DIR}/AABB_tree/doc/AABB_tree \ 
-                              ${CMAKE_SOURCE_DIR}/AABB_tree/include
+
+INPUT                      =  @{CMAKE_SOURCE_DIR}/AABB_tree/doc/AABB_tree/ \ 
+                              @{CMAKE_SOURCE_DIR}/AABB_tree/include
+
 EXTRACT_ALL                =  false
 
 HIDE_UNDOC_MEMBERS         =  true
 
 HIDE_UNDOC_CLASSES         =  true
+
diff --git a/Apollonius_graph_2/doc/Apollonius_graph_2/Doxyfile.in b/Apollonius_graph_2/doc/Apollonius_graph_2/Doxyfile.in
index 4c34d27dfc2..d213d4b0a34 100644
--- a/Apollonius_graph_2/doc/Apollonius_graph_2/Doxyfile.in
+++ b/Apollonius_graph_2/doc/Apollonius_graph_2/Doxyfile.in
@@ -2,6 +2,6 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Apollonius_graph_2/doc/Apollonius_graph_2/
 
-EXCLUDE_SYMBOLS            =  
+EXCLUDE_SYMBOLS           +=  Agvb
             
 
diff --git a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Doxyfile.in b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Doxyfile.in
index c1db7f12a85..6f4b2731a58 100644
--- a/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Doxyfile.in
+++ b/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Doxyfile.in
@@ -2,8 +2,7 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Arrangement_on_surface_2/doc/Arrangement_on_surface_2/
 
-EXCLUDE_SYMBOLS            =  
-            
-            
-            
-
+EXCLUDE_SYMBOLS           +=  Dcel         \
+                              FaceBase     \
+                              HalfedgeBase \
+                              VertexBase
\ No newline at end of file
diff --git a/CGAL_ipelets/doc/CGAL_ipelets/Doxyfile.in b/CGAL_ipelets/doc/CGAL_ipelets/Doxyfile.in
index d7089c57c53..acce11d955b 100644
--- a/CGAL_ipelets/doc/CGAL_ipelets/Doxyfile.in
+++ b/CGAL_ipelets/doc/CGAL_ipelets/Doxyfile.in
@@ -2,3 +2,5 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/CGAL_ipelets/doc/CGAL_ipelets/
 
+EXAMPLE_PATH              +=  ${CMAKE_SOURCE_DIR}/CGAL_ipelets/demo</item>
+
diff --git a/Kernel_23/doc/Kernel_23/Doxyfile.in b/Kernel_23/doc/Kernel_23/Doxyfile.in
index 4dd26a1ac61..937866305b8 100644
--- a/Kernel_23/doc/Kernel_23/Doxyfile.in
+++ b/Kernel_23/doc/Kernel_23/Doxyfile.in
@@ -2,3 +2,4 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Kernel_23/doc/Kernel_23/
 
+EXAMPLE_PATH              +=  ${CMAKE_SOURCE_DIR}/Filtered_kernel/examples</item>
\ No newline at end of file
diff --git a/Mesh_3/doc/Mesh_3/Doxyfile.in b/Mesh_3/doc/Mesh_3/Doxyfile.in
index c0bc6cadfe7..c10b39a2a19 100644
--- a/Mesh_3/doc/Mesh_3/Doxyfile.in
+++ b/Mesh_3/doc/Mesh_3/Doxyfile.in
@@ -2,6 +2,6 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Mesh_3/doc/Mesh_3/
 
-HTML_EXTRA_FILES           =  
-            
-
+HTML_EXTRA_FILES           =  ${CMAKE_SOURCE_DIR}/doc/Mesh_3/fig/implicit_domain_3.jpg \
+                              ${CMAKE_SOURCE_DIR}/fig/implicit_domain_4.jpg \
+                              ${CMAKE_SOURCE_DIR}/fig/implicit_domain_5.jpg
\ No newline at end of file
diff --git a/Nef_3/doc/Nef_3/Doxyfile.in b/Nef_3/doc/Nef_3/Doxyfile.in
index 1a782f07409..235b303b4e6 100644
--- a/Nef_3/doc/Nef_3/Doxyfile.in
+++ b/Nef_3/doc/Nef_3/Doxyfile.in
@@ -2,3 +2,4 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Nef_3/doc/Nef_3/
 
+EXAMPLE_PATH              +=  ${CMAKE_SOURCE_DIR}/Nef_3/demo</item>
\ No newline at end of file
diff --git a/Nef_S2/doc/Nef_S2/Doxyfile.in b/Nef_S2/doc/Nef_S2/Doxyfile.in
index 0d615f90c69..8edc039b131 100644
--- a/Nef_S2/doc/Nef_S2/Doxyfile.in
+++ b/Nef_S2/doc/Nef_S2/Doxyfile.in
@@ -2,6 +2,7 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Nef_S2/doc/Nef_S2/
 
-HTML_EXTRA_FILES           =  
-            
-
+HTML_EXTRA_FILES           =  ${CMAKE_SOURCE_DIR}/doc/Nef_S2/fig/halfspace.gif \
+                              ${CMAKE_SOURCE_DIR}/doc/Nef_S2/fig/complex.gif
+                              
+EXAMPLE_PATH              +=  ${CMAKE_SOURCE_DIR}/Nef_S2/demo</item>                              
\ No newline at end of file
diff --git a/Point_set_processing_3/doc/Point_set_processing_3/Doxyfile.in b/Point_set_processing_3/doc/Point_set_processing_3/Doxyfile.in
index eb33e3559ae..74eef7c7adf 100644
--- a/Point_set_processing_3/doc/Point_set_processing_3/Doxyfile.in
+++ b/Point_set_processing_3/doc/Point_set_processing_3/Doxyfile.in
@@ -3,6 +3,6 @@
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Point_set_processing_3/doc/Point_set_processing_3/ \ 
                               ${CMAKE_SOURCE_DIR}/Point_set_processing_3/include
 
-EXCLUDE_PATTERNS           =  
+EXCLUDE_PATTERNS          +=  property_map.h
             
 
diff --git a/Polyhedron/doc/Polyhedron/Doxyfile.in b/Polyhedron/doc/Polyhedron/Doxyfile.in
index 557cf94708a..30f8a6c1ffe 100644
--- a/Polyhedron/doc/Polyhedron/Doxyfile.in
+++ b/Polyhedron/doc/Polyhedron/Doxyfile.in
@@ -2,3 +2,4 @@
 
 INPUT                      =  ${CMAKE_SOURCE_DIR}/Polyhedron/doc/Polyhedron/
 
+EXAMPLE_PATH              +=  ${CMAKE_SOURCE_DIR}/Polyhedron_IO/examples
\ No newline at end of file