diff --git a/STL_Extension/include/CGAL/Cache.h b/STL_Extension/include/CGAL/Cache.h
index f27221a1acf..bd3d1c42cc5 100644
--- a/STL_Extension/include/CGAL/Cache.h
+++ b/STL_Extension/include/CGAL/Cache.h
@@ -29,7 +29,6 @@
 #define CGAL_CACHE_H 1
 
 #include <CGAL/basic.h>
-#include <CGAL/LiS/basic.h>
 #include <CGAL/function_objects.h>
 
 #include <map>
diff --git a/STL_Extension/include/CGAL/Flattening_iterator.h b/STL_Extension/include/CGAL/Flattening_iterator.h
index b9102d40e7b..d4ffe0f585c 100644
--- a/STL_Extension/include/CGAL/Flattening_iterator.h
+++ b/STL_Extension/include/CGAL/Flattening_iterator.h
@@ -37,7 +37,6 @@
 #define CGAL_FLATTENING_ITERATOR_H 1
 
 #include <CGAL/basic.h>
-#include <CGAL/LiS/basic.h>
 #include <CGAL/Nested_iterator.h>
 
 #include <iterator>
diff --git a/STL_Extension/test/STL_Extension/cgal_test b/STL_Extension/test/STL_Extension/cgal_test
index 5c79f370dad..215be5276d7 100755
--- a/STL_Extension/test/STL_Extension/cgal_test
+++ b/STL_Extension/test/STL_Extension/cgal_test
@@ -70,11 +70,15 @@ if [ $# -ne 0 ] ; then
     compile_and_run $file
   done
 else
+  compile_and_run test_Cache
   compile_and_run test_Compact_container
   compile_and_run test_Concatenate_iterator
+  compile_and_run test_Flattening_iterator
+  compile_and_run test_Handle_with_policy
   compile_and_run test_In_place_list
   compile_and_run test_Nested_iterator
   compile_and_run test_composition
+  compile_and_run test_lexcompare_outputrange
   compile_and_run test_new_binders1
   compile_and_run test_stl_extension
   compile_and_run test_vector
diff --git a/STL_Extension/test/STL_Extension/makefile b/STL_Extension/test/STL_Extension/makefile
index 565a9feef30..09dcc5ffb05 100644
--- a/STL_Extension/test/STL_Extension/makefile
+++ b/STL_Extension/test/STL_Extension/makefile
@@ -40,22 +40,35 @@ LDFLAGS = \
 #---------------------------------------------------------------------#
 
 all:            \
+                test_Cache$(EXE_EXT) \
                 test_Compact_container$(EXE_EXT) \
                 test_Concatenate_iterator$(EXE_EXT) \
+                test_Flattening_iterator$(EXE_EXT) \
+                test_Handle_with_policy$(EXE_EXT) \
                 test_In_place_list$(EXE_EXT) \
                 test_Nested_iterator$(EXE_EXT) \
                 test_composition$(EXE_EXT) \
+                test_lexcompare_outputrange$(EXE_EXT) \
                 test_new_binders1$(EXE_EXT) \
                 test_stl_extension$(EXE_EXT) \
                 test_vector$(EXE_EXT) \
                 test_multiset$(EXE_EXT) 
 
+test_Cache$(EXE_EXT): test_Cache$(OBJ_EXT)
+	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_Cache test_Cache$(OBJ_EXT) $(LDFLAGS)
+
 test_Compact_container$(EXE_EXT): test_Compact_container$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_Compact_container test_Compact_container$(OBJ_EXT) $(LDFLAGS)
 
 test_Concatenate_iterator$(EXE_EXT): test_Concatenate_iterator$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_Concatenate_iterator test_Concatenate_iterator$(OBJ_EXT) $(LDFLAGS)
 
+test_Flattening_iterator$(EXE_EXT): test_Flattening_iterator$(OBJ_EXT)
+	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_Flattening_iterator test_Flattening_iterator$(OBJ_EXT) $(LDFLAGS)
+
+test_Handle_with_policy$(EXE_EXT): test_Handle_with_policy$(OBJ_EXT)
+	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_Handle_with_policy test_Handle_with_policy$(OBJ_EXT) $(LDFLAGS)
+
 test_In_place_list$(EXE_EXT): test_In_place_list$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_In_place_list test_In_place_list$(OBJ_EXT) $(LDFLAGS)
 
@@ -65,6 +78,9 @@ test_Nested_iterator$(EXE_EXT): test_Nested_iterator$(OBJ_EXT)
 test_composition$(EXE_EXT): test_composition$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_composition test_composition$(OBJ_EXT) $(LDFLAGS)
 
+test_lexcompare_outputrange$(EXE_EXT): test_lexcompare_outputrange$(OBJ_EXT)
+	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_lexcompare_outputrange test_lexcompare_outputrange$(OBJ_EXT) $(LDFLAGS)
+
 test_new_binders1$(EXE_EXT): test_new_binders1$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_new_binders1 test_new_binders1$(OBJ_EXT) $(LDFLAGS)
 
@@ -78,11 +94,15 @@ test_multiset$(EXE_EXT): test_multiset$(OBJ_EXT)
 	$(CGAL_CXX) $(LIBPATH) $(EXE_OPT)test_multiset test_multiset$(OBJ_EXT) $(LDFLAGS)
 
 clean: \
+                   test_Cache.clean \
                    test_Compact_container.clean \
                    test_Concatenate_iterator.clean \
+                   test_Flattening_iterator.clean \
+                   test_Handle_with_policy.clean \
                    test_In_place_list.clean \
                    test_Nested_iterator.clean \
                    test_composition.clean \
+                   test_lexcompare_outputrange.clean \
                    test_new_binders1.clean \
                    test_stl_extension.clean \
                    test_vector.clean \
diff --git a/STL_Extension/test/STL_Extension/test_Handle_with_policy.C b/STL_Extension/test/STL_Extension/test_Handle_with_policy.C
index a9542dec932..0931386972b 100644
--- a/STL_Extension/test/STL_Extension/test_Handle_with_policy.C
+++ b/STL_Extension/test/STL_Extension/test_Handle_with_policy.C
@@ -33,7 +33,6 @@
 #include <CGAL/memory.h>
 #include <CGAL/Testsuite/assert.h>
 
-#include <CGAL/LiS/basic.h>
 #include <CGAL/Handle_with_policy.h>
 #include <cstdlib>