diff --git a/Triangulation_2/test/Triangulation_2_constrained/makefile b/Triangulation_2/test/Triangulation_2_constrained/makefile
index 90f9d1bac5d..0108faf76e4 100644
--- a/Triangulation_2/test/Triangulation_2_constrained/makefile
+++ b/Triangulation_2/test/Triangulation_2_constrained/makefile
@@ -1,3 +1,6 @@
+# Created by the script cgal_create_makefile
+# This is the makefile for compiling a CGAL application.
+
 #---------------------------------------------------------------------#
 #                    include platform specific settings
 #---------------------------------------------------------------------#
@@ -11,50 +14,57 @@ include $(CGAL_MAKEFILE)
 #---------------------------------------------------------------------#
 
 CXXFLAGS = \
-	-I../../include \
-	-I../Triangulation_2/include \
-	$(TESTSUITE_CXXFLAGS) \
-	$(EXTRA_FLAGS) \
-	$(CGAL_CXXFLAGS) \
-	$(LONG_NAME_PROBLEM_CXXFLAGS) \
-	$(DEBUG_OPT)
+           -I../../include \
+           -I../Triangulation_2/include \
+           $(TESTSUITE_CXXFLAGS) \
+           $(EXTRA_FLAGS) \
+           $(CGAL_CXXFLAGS) \
+           $(LONG_NAME_PROBLEM_CXXFLAGS)
 
 #---------------------------------------------------------------------#
 #                    linker flags
 #---------------------------------------------------------------------#
 
 LIBPATH = \
-	$(TESTSUITE_LIBPATH) \
-	$(CGAL_LIBPATH)
+          $(TESTSUITE_LIBPATH) \
+          $(CGAL_LIBPATH)
 
 LDFLAGS = \
-	$(TESTSUITE_LDFLAGS) \
-	$(LONG_NAME_PROBLEM_LDFLAGS) \
-	$(CGAL_LDFLAGS)
+          $(TESTSUITE_LDFLAGS) \
+          $(LONG_NAME_PROBLEM_LDFLAGS) \
+          $(CGAL_LDFLAGS)
 
 #---------------------------------------------------------------------#
 #                    target entries
 #---------------------------------------------------------------------#
 
-all: \
-		test_const_del_triangulation_2$(EXE_EXT) \
-		test_constrained_triangulation_2$(EXE_EXT) \
-		test_const_triang_plus_2$(EXE_EXT) 
+all:            \
+                test_const_del_triangulation_2$(EXE_EXT) \
+                test_constrained_triangulation_2$(EXE_EXT) \
+                test_const_triang_plus_2$(EXE_EXT) 
+
+test_const_del_triangulation_2$(OBJ_EXT): test_const_del_triangulation_2.cpp
+	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) test_const_del_triangulation_2.cpp
 
 test_const_del_triangulation_2$(EXE_EXT): test_const_del_triangulation_2$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_const_del_triangulation_2 test_const_del_triangulation_2$(OBJ_EXT) $(LDFLAGS)
 
+test_constrained_triangulation_2$(OBJ_EXT): test_constrained_triangulation_2.cpp
+	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) test_constrained_triangulation_2.cpp
+
 test_constrained_triangulation_2$(EXE_EXT): test_constrained_triangulation_2$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_constrained_triangulation_2 test_constrained_triangulation_2$(OBJ_EXT) $(LDFLAGS)
 
-test_const_triang_plus_2: test_const_triang_plus_2$(OBJ_EXT)	
+test_const_triang_plus_2$(OBJ_EXT): test_const_triang_plus_2.cpp
+	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) test_const_triang_plus_2.cpp
+
+test_const_triang_plus_2$(EXE_EXT): test_const_triang_plus_2$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_const_triang_plus_2 test_const_triang_plus_2$(OBJ_EXT) $(LDFLAGS)
 
-
 clean: \
-		test_const_del_triangulation_2.clean \
-		test_constrained_triangulation_2.clean \
-		test_const_triang_plus_2.clean
+                   test_const_del_triangulation_2.clean \
+                   test_constrained_triangulation_2.clean \
+                   test_const_triang_plus_2.clean 
 
 #---------------------------------------------------------------------#
 #                    suffix rules
@@ -63,3 +73,7 @@ clean: \
 .C$(OBJ_EXT):
 	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
 
+
+.cpp$(OBJ_EXT):
+	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
+
diff --git a/Triangulation_2/test/Triangulation_2_constrained/test_const_del_triangulation_2.C b/Triangulation_2/test/Triangulation_2_constrained/test_const_del_triangulation_2.cpp
similarity index 100%
rename from Triangulation_2/test/Triangulation_2_constrained/test_const_del_triangulation_2.C
rename to Triangulation_2/test/Triangulation_2_constrained/test_const_del_triangulation_2.cpp
diff --git a/Triangulation_2/test/Triangulation_2_constrained/test_const_triang_plus_2.C b/Triangulation_2/test/Triangulation_2_constrained/test_const_triang_plus_2.cpp
similarity index 100%
rename from Triangulation_2/test/Triangulation_2_constrained/test_const_triang_plus_2.C
rename to Triangulation_2/test/Triangulation_2_constrained/test_const_triang_plus_2.cpp
diff --git a/Triangulation_2/test/Triangulation_2_constrained/test_constrained_triangulation_2.C b/Triangulation_2/test/Triangulation_2_constrained/test_constrained_triangulation_2.cpp
similarity index 100%
rename from Triangulation_2/test/Triangulation_2_constrained/test_constrained_triangulation_2.C
rename to Triangulation_2/test/Triangulation_2_constrained/test_constrained_triangulation_2.cpp