diff --git a/Packages/Polygon/include/CGAL/Polygon_2.h b/Packages/Polygon/include/CGAL/Polygon_2.h
index 38ef40c2e94..ac674f1eeab 100644
--- a/Packages/Polygon/include/CGAL/Polygon_2.h
+++ b/Packages/Polygon/include/CGAL/Polygon_2.h
@@ -29,17 +29,11 @@
 #endif // CGAL_BASIC_H
 
 #ifdef CGAL_CFG_NO_MEMBER_TEMPLATES
-#ifndef CGAL_STD_VECTOR_H
-#include <CGAL/std/vector>
-#endif
-#ifndef CGAL_STD_LIST_H
-#include <CGAL/std/list>
-#endif
+#include <vector.h>
+#include <list.h>
 #endif
 
-#ifndef CGAL_STD_ITERATOR_H
-#include <CGAL/std/iterator>
-#endif
+#include <iterator.h>
 
 #ifndef CGAL_CIRCULATOR_H
 #include <CGAL/circulator.h>
diff --git a/Packages/Polygon/include/CGAL/Polygon_2_algorithms.C b/Packages/Polygon/include/CGAL/Polygon_2_algorithms.C
index fed21702742..c2a6d27cd6b 100644
--- a/Packages/Polygon/include/CGAL/Polygon_2_algorithms.C
+++ b/Packages/Polygon/include/CGAL/Polygon_2_algorithms.C
@@ -34,9 +34,7 @@
 #ifndef CGAL_STD_SET_H
 #include <CGAL/std/set>
 #endif
-#ifndef CGAL_STD_VECTOR_H
-#include <CGAL/std/vector>
-#endif
+#include <vector.h>
 
 //-----------------------------------------------------------------------//
 //                          CGAL_Simplicity_test_2
diff --git a/Packages/Polygon/include/CGAL/Polygon_2_edge_circulator.h b/Packages/Polygon/include/CGAL/Polygon_2_edge_circulator.h
index 43bd30fd12b..7d1b6bb9013 100644
--- a/Packages/Polygon/include/CGAL/Polygon_2_edge_circulator.h
+++ b/Packages/Polygon/include/CGAL/Polygon_2_edge_circulator.h
@@ -24,9 +24,7 @@
 #ifndef CGAL_POLYGON_2_EDGE_CIRCULATOR_H
 #define CGAL_POLYGON_2_EDGE_CIRCULATOR_H
 
-#ifndef CGAL_STD_ITERATOR_H
-#include <CGAL/std/iterator>
-#endif
+#include <iterator.h>
 #ifndef CGAL_CIRCULATOR_H
 #include <CGAL/circulator.h>
 #endif // CGAL_CIRCULATOR_H
diff --git a/Packages/Polygon/include/CGAL/Polygon_2_edge_iterator.h b/Packages/Polygon/include/CGAL/Polygon_2_edge_iterator.h
index 2a196a4561b..e93c917466d 100644
--- a/Packages/Polygon/include/CGAL/Polygon_2_edge_iterator.h
+++ b/Packages/Polygon/include/CGAL/Polygon_2_edge_iterator.h
@@ -24,9 +24,7 @@
 #ifndef CGAL_POLYGON_2_EDGE_ITERATOR_H
 #define CGAL_POLYGON_2_EDGE_ITERATOR_H
 
-#ifndef CGAL_STD_ITERATOR_H
-#include <CGAL/std/iterator>
-#endif
+#include <iterator.h>
 #ifndef CGAL_CIRCULATOR_H
 #include <CGAL/circulator.h>
 #endif // CGAL_CIRCULATOR_H