diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h
index ee5c95e6180..761c7fe1f91 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_storages.h
@@ -74,7 +74,7 @@ namespace CGAL {
     struct Container_for_attributes :
       public internal::Container_type
                      <Concurrent_tag, T,
-                      typename std::allocator_traits<Alloc_>::template rebind_alloc<T>>::type
+                      typename Allocator_traits::template rebind_alloc<T>>::type
     {};
     /// Typedef for attributes
     typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type
diff --git a/Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h b/Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h
index acfcb1c7fba..aad7d643787 100644
--- a/Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h
+++ b/Combinatorial_map/include/CGAL/Combinatorial_map_storages_with_index.h
@@ -74,7 +74,7 @@ namespace CGAL {
     template <typename T>
     struct Container_for_attributes : public
         Compact_container_with_index<T,
-        typename Alloc_::template rebind<T>::other,
+        typename Allocator_traits::template rebind_alloc<T>,
         Multiply_by_two_policy_for_cc_with_size<64>, size_type >
     {};
     /// Typedef for attributes
diff --git a/Generalized_map/include/CGAL/Generalized_map_storages.h b/Generalized_map/include/CGAL/Generalized_map_storages.h
index b1c936929dc..d8200128efc 100644
--- a/Generalized_map/include/CGAL/Generalized_map_storages.h
+++ b/Generalized_map/include/CGAL/Generalized_map_storages.h
@@ -74,7 +74,7 @@ namespace CGAL {
     struct Container_for_attributes :
       public internal::Container_type
                      <Concurrent_tag, T,
-                      typename std::allocator_traits<Alloc_>::template rebind_alloc<T>>::type
+                      typename Allocator_traits::template rebind_alloc<T>>::type
     {};
     /// Typedef for attributes
     typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type
diff --git a/Generalized_map/include/CGAL/Generalized_map_storages_with_index.h b/Generalized_map/include/CGAL/Generalized_map_storages_with_index.h
index ead5f6e5811..80044bdc7d3 100644
--- a/Generalized_map/include/CGAL/Generalized_map_storages_with_index.h
+++ b/Generalized_map/include/CGAL/Generalized_map_storages_with_index.h
@@ -74,7 +74,7 @@ namespace CGAL {
     template <typename T>
     struct Container_for_attributes : public
         Compact_container_with_index<T,
-        typename Alloc_::template rebind<T>::other,
+        typename Allocator_traits::template rebind_alloc<T>,
         Multiply_by_two_policy_for_cc_with_size<64>, size_type >
     {};
     /// Typedef for attributes
diff --git a/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h b/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h
index a50e1a53ad0..bb02bb50a21 100644
--- a/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h
+++ b/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages.h
@@ -84,7 +84,7 @@ namespace CGAL {
     struct Container_for_attributes :
       public internal::Container_type
                      <Concurrent_tag, T,
-                      typename std::allocator_traits<Alloc_>::template rebind_alloc<T>>::type
+                      typename Allocator_traits::template rebind_alloc<T>>::type
     {};
     /// Typedef for attributes
     typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type
diff --git a/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h b/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h
index 7597a3d7f3e..7af89e3a4e1 100644
--- a/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h
+++ b/Linear_cell_complex/include/CGAL/CMap_linear_cell_complex_storages_with_index.h
@@ -84,7 +84,7 @@ namespace CGAL {
     template <typename T>
     struct Container_for_attributes : public
         Compact_container_with_index<T,
-        typename Alloc_::template rebind<T>::other,
+        typename Allocator_traits::template rebind_alloc<T>,
         Multiply_by_two_policy_for_cc_with_size<64>, size_type >
     {};
     /// Typedef for attributes
diff --git a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
index 9dcdbe5b541..d3d17b3cea4 100644
--- a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
+++ b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages.h
@@ -84,7 +84,7 @@ namespace CGAL {
     struct Container_for_attributes :
       public internal::Container_type
                      <Concurrent_tag, T,
-                      typename std::allocator_traits<Alloc_>::template rebind_alloc<T>>::type
+                      typename Allocator_traits::template rebind_alloc<T>>::type
     {};
     /// Typedef for attributes
     typedef typename internal::template Get_attributes_tuple<Dart_wrapper>::type
diff --git a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h
index 2e27cb619f2..19800125135 100644
--- a/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h
+++ b/Linear_cell_complex/include/CGAL/GMap_linear_cell_complex_storages_with_index.h
@@ -84,7 +84,7 @@ namespace CGAL {
     template <typename T>
     struct Container_for_attributes : public
         Compact_container_with_index<T,
-        typename Alloc_::template rebind<T>::other,
+        typename Allocator_traits::template rebind_alloc<T>,
         Multiply_by_two_policy_for_cc_with_size<64>, size_type >
     {};
     /// Typedef for attributes