diff --git a/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h b/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h
index 5c310955406..91a387cd6c2 100644
--- a/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h
+++ b/Linear_cell_complex/demo/Linear_cell_complex/typedefs.h
@@ -20,11 +20,7 @@
 #ifndef TYPEDEFS_H
 #define TYPEDEFS_H
 
-#include <CGAL/Linear_cell_complex.h>
-#include <CGAL/Linear_cell_complex_constructors.h>
-#include <CGAL/Linear_cell_complex_operations.h>
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
-#include <CGAL/Combinatorial_map_save_load.h>
 
 #include <CGAL/Triangulation_2_projection_traits_3.h>
 #include <CGAL/Triangulation_vertex_base_with_info_2.h>
@@ -32,6 +28,11 @@
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_plus_2.h>
 
+#include <CGAL/Linear_cell_complex.h>
+#include <CGAL/Linear_cell_complex_constructors.h>
+#include <CGAL/Linear_cell_complex_operations.h>
+#include <CGAL/Combinatorial_map_save_load.h>
+
 #include <CGAL/IO/Color.h>
 #include <CGAL/Timer.h>
 #include <CGAL/Random.h>
diff --git a/Linear_cell_complex/test/Linear_cell_complex/flat.cpp b/Linear_cell_complex/test/Linear_cell_complex/flat.cpp
new file mode 100644
index 00000000000..d6aa4d24f1c
--- /dev/null
+++ b/Linear_cell_complex/test/Linear_cell_complex/flat.cpp
@@ -0,0 +1,12 @@
+
+#include <boost/property_tree/xml_parser.hpp>
+#include <boost/property_tree/ptree.hpp>
+
+#include <boost/container/flat_set.hpp>
+
+int main()
+{
+  boost::container::flat_set<int> fs;
+
+  return 0;
+}