diff --git a/Mesh_2/demo/Mesh_2/Qt_widget_style_editor.C b/Mesh_2/demo/Mesh_2/Qt_widget_style_editor.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/Qt_widget_style_editor.C
rename to Mesh_2/demo/Mesh_2/Qt_widget_style_editor.cpp
diff --git a/Mesh_2/demo/Mesh_2/Qt_widget_styled_layer.C b/Mesh_2/demo/Mesh_2/Qt_widget_styled_layer.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/Qt_widget_styled_layer.C
rename to Mesh_2/demo/Mesh_2/Qt_widget_styled_layer.cpp
diff --git a/Mesh_2/demo/Mesh_2/Show_points.C b/Mesh_2/demo/Mesh_2/Show_points.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/Show_points.C
rename to Mesh_2/demo/Mesh_2/Show_points.cpp
diff --git a/Mesh_2/demo/Mesh_2/Show_segments_base.C b/Mesh_2/demo/Mesh_2/Show_segments_base.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/Show_segments_base.C
rename to Mesh_2/demo/Mesh_2/Show_segments_base.cpp
diff --git a/Mesh_2/demo/Mesh_2/conform.C b/Mesh_2/demo/Mesh_2/conform.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/conform.C
rename to Mesh_2/demo/Mesh_2/conform.cpp
diff --git a/Mesh_2/demo/Mesh_2/icons.C b/Mesh_2/demo/Mesh_2/icons.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/icons.C
rename to Mesh_2/demo/Mesh_2/icons.cpp
diff --git a/Mesh_2/demo/Mesh_2/makefile b/Mesh_2/demo/Mesh_2/makefile
index 93a405a66ad..ab55a5219ca 100644
--- a/Mesh_2/demo/Mesh_2/makefile
+++ b/Mesh_2/demo/Mesh_2/makefile
@@ -59,16 +59,16 @@ Qt_widget_style_editor$(OBJ_EXT): Qt_widget_style_editor-aux.moc Qt_widget_style
 Show_points.moc: Show_points.h
 	$(QT_MOC) -o Show_points.moc Show_points.h
 
-Show_points$(OBJ_EXT): Show_points.moc Show_points.C
+Show_points$(OBJ_EXT): Show_points.moc Show_points.cpp
 
 Show_segments_base.moc:  Show_segments_base.h
 	$(QT_MOC) -o Show_segments_base.moc Show_segments_base.h
 
-Show_segments_base$(OBJ_EXT): Show_segments_base.moc Show_segments_base.C
+Show_segments_base$(OBJ_EXT): Show_segments_base.moc Show_segments_base.cpp
 
 icons$(OBJ_EXT): seeds.xpm marked.xpm contraints.xpm
 
-mesh_demo.moc:  mesh_demo.C
+mesh_demo.moc:  mesh_demo.cpp
 	$(QT_MOC) -o mesh_demo.moc $<
 
 Show_clusters.moc: Show_clusters.h
@@ -116,6 +116,6 @@ clean: \
 #                    suffix rules
 #---------------------------------------------------------------------#
 
-.C$(OBJ_EXT):
+.cpp$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
 
diff --git a/Mesh_2/demo/Mesh_2/mesh.C b/Mesh_2/demo/Mesh_2/mesh.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/mesh.C
rename to Mesh_2/demo/Mesh_2/mesh.cpp
diff --git a/Mesh_2/demo/Mesh_2/mesh_demo.C b/Mesh_2/demo/Mesh_2/mesh_demo.cpp
similarity index 100%
rename from Mesh_2/demo/Mesh_2/mesh_demo.C
rename to Mesh_2/demo/Mesh_2/mesh_demo.cpp
diff --git a/Mesh_2/doc_tex/Mesh_2/main.tex b/Mesh_2/doc_tex/Mesh_2/main.tex
index 10482c260b6..e924801072d 100644
--- a/Mesh_2/doc_tex/Mesh_2/main.tex
+++ b/Mesh_2/doc_tex/Mesh_2/main.tex
@@ -90,7 +90,7 @@ triangulation, makes it conforming Delaunay, and then conforming
 Gabriel. At each step, the number of vertices of the triangulation is
 printed.
 
-\ccIncludeExampleCode{Mesh_2/conforming.C}
+\ccIncludeExampleCode{Mesh_2/conforming.cpp}
 
 See figures~\ref{Conform-example-conform},
 \ref{Conform-example-conform-Delaunay}
@@ -327,7 +327,7 @@ provided by the criteria class \ccc{Delaunay_mesh_criteria_2<K>}. No seeds are
 given, meaning that the mesh domain covers the whole plane except the
 unbounded component.
 
-\ccIncludeExampleCode{Mesh_2/mesh_global.C}
+\ccIncludeExampleCode{Mesh_2/mesh_global.cpp}
 
 \subsection{Example Using the Class \protect\ccc{Delaunay_mesher_2<CDT>}}
 
@@ -338,7 +338,7 @@ This example uses the class \ccc{Delaunay_mesher_2<CDT>} and calls
   because some internal structures needed by the algorithm would be
   built twice.
 
-\ccIncludeExampleCode{Mesh_2/mesh_class.C}
+\ccIncludeExampleCode{Mesh_2/mesh_class.cpp}
 
 \subsection{Example Using Seeds}
 
@@ -346,7 +346,7 @@ This example uses the global function \ccc{refine_Delaunay_mesh_2} but
 defines a domain by using one seed. The size and shape criteria are the
 default ones provided by the criteria class \ccc{Delaunay_mesh_criteria_2<K>}.
 
-\ccIncludeExampleCode{Mesh_2/mesh_with_seeds.C}
+\ccIncludeExampleCode{Mesh_2/mesh_with_seeds.cpp}
 
 %%% For emacs/AucTeX:
 %%% Local Variables: ***
diff --git a/Mesh_2/doc_tex/Mesh_2_ref/Mesher_level.tex b/Mesh_2/doc_tex/Mesh_2_ref/Mesher_level.tex
index d9a3060c3a0..cea9fd8cb10 100644
--- a/Mesh_2/doc_tex/Mesh_2_ref/Mesher_level.tex
+++ b/Mesh_2/doc_tex/Mesh_2_ref/Mesher_level.tex
@@ -282,7 +282,7 @@ in this mesher level and in all the cascaded previous levels.}
 A short example program.
 Instead of a short program fragment, a full running program can be
 included using the 
-\verb|\ccIncludeExampleCode{Package/Mesher_level.C}| 
+\verb|\ccIncludeExampleCode{Package/Mesher_level.cpp}| 
 macro. The program example would be part of the source code distribution and
 also part of the automatic test suite.
 
@@ -291,7 +291,7 @@ void your_example_code() {
 }
 \end{ccExampleCode}
 
-%% \ccIncludeExampleCode{Package/Mesher_level.C}
+%% \ccIncludeExampleCode{Package/Mesher_level.cpp}
 
 \end{ccRefClass}
 
diff --git a/Mesh_2/examples/Mesh_2/conforming.C b/Mesh_2/examples/Mesh_2/conforming.cpp
similarity index 100%
rename from Mesh_2/examples/Mesh_2/conforming.C
rename to Mesh_2/examples/Mesh_2/conforming.cpp
diff --git a/Mesh_2/examples/Mesh_2/makefile b/Mesh_2/examples/Mesh_2/makefile
index 75aac7a1c6d..b5d91b4d37f 100644
--- a/Mesh_2/examples/Mesh_2/makefile
+++ b/Mesh_2/examples/Mesh_2/makefile
@@ -63,6 +63,6 @@ clean: \
 #                    suffix rules
 #---------------------------------------------------------------------#
 
-.C$(OBJ_EXT):
+.cpp$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
 
diff --git a/Mesh_2/examples/Mesh_2/mesh_class.C b/Mesh_2/examples/Mesh_2/mesh_class.cpp
similarity index 100%
rename from Mesh_2/examples/Mesh_2/mesh_class.C
rename to Mesh_2/examples/Mesh_2/mesh_class.cpp
diff --git a/Mesh_2/examples/Mesh_2/mesh_global.C b/Mesh_2/examples/Mesh_2/mesh_global.cpp
similarity index 100%
rename from Mesh_2/examples/Mesh_2/mesh_global.C
rename to Mesh_2/examples/Mesh_2/mesh_global.cpp
diff --git a/Mesh_2/examples/Mesh_2/mesh_with_seeds.C b/Mesh_2/examples/Mesh_2/mesh_with_seeds.cpp
similarity index 100%
rename from Mesh_2/examples/Mesh_2/mesh_with_seeds.C
rename to Mesh_2/examples/Mesh_2/mesh_with_seeds.cpp