diff --git a/SearchStructures/test/RangeSegmentTrees/makefile b/SearchStructures/test/RangeSegmentTrees/makefile
deleted file mode 100644
index ce4b5e843ef..00000000000
--- a/SearchStructures/test/RangeSegmentTrees/makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-# Created by the script cgal_create_makefile
-# This is the makefile for compiling a CGAL application.
-
-#---------------------------------------------------------------------#
-#                    include platform specific settings
-#---------------------------------------------------------------------#
-# Choose the right include file from the <cgalroot>/make directory.
-
-# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE
-#CGAL_MAKEFILE = d:/cgal/CGAL-2.5-I-69/make/makefile_i686_CYGWINNT-5.0-1.3.12_g++-2.95
-#CGAL_MAKEFILE = d:/cgal/CGAL-2.5-I-69/make/makefile_i686_CYGWINNT-5.0-1.3.12_ICL.EXE-7
-#CGAL_MAKEFILE = d:/cgal/CGAL-2.5-I-69/make/makefile_i686_CYGWINNT-5.0-1.3.12_CL.EXE-1300
-#CGAL_MAKEFILE = d:/cgal/CGAL-2.4-I-90/make/makefile_i686_CYGWINNT-5.0-1.3.12_ICL.EXE-7
-
-include $(CGAL_MAKEFILE)
-
-#---------------------------------------------------------------------#
-#                    compiler flags
-#---------------------------------------------------------------------#
-
-CXXFLAGS = \
-           $(TESTSUITE_CXXFLAGS) \
-           $(EXTRA_FLAGS) \
-           $(CGAL_CXXFLAGS) \
-           $(LONG_NAME_PROBLEM_CXXFLAGS) \
-           $(DEBUG_OPT)
-
-# -I../../include \
-
-#---------------------------------------------------------------------#
-#                    linker flags
-#---------------------------------------------------------------------#
-
-LIBPATH = \
-          $(TESTSUITE_LIBPATH) \
-          $(CGAL_LIBPATH)
-
-LDFLAGS = \
-          $(TESTSUITE_LDFLAGS) \
-          $(LONG_NAME_PROBLEM_LDFLAGS) \
-          $(CGAL_LDFLAGS)
-
-#---------------------------------------------------------------------#
-#                    target entries
-#---------------------------------------------------------------------#
-
-all:            \
-                segment_tree_set_2$(EXE_EXT) 
-
-segment_tree_set_2$(EXE_EXT): segment_tree_set_2$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)segment_tree_set_2 segment_tree_set_2$(OBJ_EXT) $(LDFLAGS)
-
-generate$(EXE_EXT): generate$(OBJ_EXT)
-	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)generate generate$(OBJ_EXT) $(LDFLAGS)
-
-run: segment_tree_set_2$(EXE_EXT)
-	segment_tree_set_2$(EXE_EXT) < thousand.rect > thousand.tmp; diff thousand.out thousand.tmp
-clean: \
-                   segment_tree_set_2.clean generate.clean
-
-#---------------------------------------------------------------------#
-#                    suffix rules
-#---------------------------------------------------------------------#
-
-.C$(OBJ_EXT):
-	$(CGAL_CXX) $(CXXFLAGS) $(OBJ_OPT) $<
-
diff --git a/SearchStructures/test/RangeSegmentTrees/segment_tree_set_2.C b/SearchStructures/test/RangeSegmentTrees/segment_tree_set_2.cpp
similarity index 100%
rename from SearchStructures/test/RangeSegmentTrees/segment_tree_set_2.C
rename to SearchStructures/test/RangeSegmentTrees/segment_tree_set_2.cpp