diff --git a/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h b/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h
index 9adf47aa3f2..f46096ddf12 100644
--- a/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h
+++ b/Mesh_2/include/CGAL/Delaunay_mesh_criteria_2.h
@@ -22,6 +22,7 @@
 #define CGAL_DELAUNAY_MESH_CRITERIA_2_H
 
 #include <CGAL/Mesh_2/Face_badness.h>
+#include <CGAL/number_utils.h>
 
 namespace CGAL {
 
diff --git a/Mesh_2/include/CGAL/Filter_circulator.h b/Mesh_2/include/CGAL/Filter_circulator.h
index 132bf2aeb8d..bf53f0d6db7 100644
--- a/Mesh_2/include/CGAL/Filter_circulator.h
+++ b/Mesh_2/include/CGAL/Filter_circulator.h
@@ -21,6 +21,9 @@
 #ifndef CGAL_FILTRED_CIRCULATOR_H
 #define CGAL_FILTRED_CIRCULATOR_H
 
+#include <CGAL/config.h>
+#include <CGAL/assertions.h>
+
 namespace CGAL {
 
 template <class Circ, class Pred>
diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
index 758e1ff4a73..fb04217b162 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
@@ -355,7 +355,9 @@ insert_corners()
           nearest =  (*it)->point();
         }
       }
-      const FT nearest_sq_dist = CGAL::squared_distance( nearest, p);
+      typename Gt::Compute_squared_distance_3 squared_distance = 
+        c3t3_.triangulation().geom_traits().compute_squared_distance_3_object();
+      const FT nearest_sq_dist = squared_distance( nearest, p);
       
       w = (std::min)(w, nearest_sq_dist / FT(9));
     }
diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
index 9592d6ff773..32cc3d0d456 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
@@ -31,6 +31,8 @@
 #include <CGAL/Meshes/Double_map_container.h>
 #include <CGAL/Meshes/Triangulation_mesher_level_traits_3.h>
 
+#include <CGAL/Object.h>
+
 #include <boost/format.hpp>
 #include <boost/optional.hpp>
 #include <boost/mpl/has_xxx.hpp>
@@ -692,6 +694,7 @@ compute_facet_properties(const Facet& facet) const
 
   // Functor
   typename Gt::Is_degenerate_3 is_degenerate = Gt().is_degenerate_3_object();
+  typename Gt::Compare_xyz_3 compare_xyz = Gt().compare_xyz_3_object();
   typename MD::Do_intersect_surface do_intersect_surface =
       r_oracle_.do_intersect_surface_object();
 
@@ -714,7 +717,7 @@ compute_facet_properties(const Facet& facet) const
       // Trick to have canonical vector : thus, we compute alwais the same
       // intersection
       Segment_3 segment = *p_segment;
-      if ( CGAL::compare_xyz(p_segment->source(),p_segment->target())
+      if ( compare_xyz(p_segment->source(),p_segment->target())
               == CGAL::LARGER )
       {
         typename Gt::Construct_opposite_segment_3 opposite =
@@ -764,7 +767,8 @@ compute_facet_properties(const Facet& facet) const
       // Trick to have canonical vector : thus, we compute alwais the same
       // intersection
       Line_3 line = *p_line;
-      if ( CGAL::compare_xyz(p_line->point(0),p_line->point(1))
+      typename Gt::Compare_xyz_3 compare_xyz = Gt().compare_xyz_3_object();
+      if ( compare_xyz(p_line->point(0),p_line->point(1))
               == CGAL::LARGER )
       {
         typename Gt::Construct_opposite_line_3 opposite =
diff --git a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_cell_criteria.h b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_cell_criteria.h
index a2dd88d7228..a5edf1429d2 100644
--- a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_cell_criteria.h
+++ b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_cell_criteria.h
@@ -28,6 +28,9 @@
 
 
 #include <CGAL/Mesh_3/mesh_standard_criteria.h>
+#include <CGAL/utils.h> // for CGAL::min
+#include <CGAL/number_utils.h> // for CGAL::square
+#include <CGAL/enum.h>
 
 
 namespace CGAL {
diff --git a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h
index 800e1768d5e..55244677029 100644
--- a/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h
+++ b/Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h
@@ -27,7 +27,9 @@
 #ifndef CGAL_MESH_3_MESH_STANDARD_FACET_CRITERIA_H
 #define CGAL_MESH_3_MESH_STANDARD_FACET_CRITERIA_H
 
+#include <CGAL/number_utils.h> // for to_double
 #include <CGAL/Mesh_3/mesh_standard_criteria.h>
+#include <cmath>
 
 
 namespace CGAL {
diff --git a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
index a2fdb83fa93..27ad8e11564 100644
--- a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
+++ b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
@@ -35,6 +35,7 @@
 #include <boost/random/variate_generator.hpp>
 
 #include <string>
+#include <ctime>
 
 
 namespace CGAL {
diff --git a/Mesh_3/include/CGAL/exude_mesh_3.h b/Mesh_3/include/CGAL/exude_mesh_3.h
index f28d2e2a8fe..e71764534b7 100644
--- a/Mesh_3/include/CGAL/exude_mesh_3.h
+++ b/Mesh_3/include/CGAL/exude_mesh_3.h
@@ -29,6 +29,8 @@
 #include <CGAL/Mesh_3/Slivers_exuder.h>
 #include <CGAL/Mesh_optimization_return_code.h>
 #include <CGAL/Mesh_3/parameters_defaults.h>
+#include <CGAL/Mesh_3/global_parameters.h>
+#include <boost/parameter.hpp>
 
 namespace CGAL {
 
diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h
index c9e9d5a6852..9af5d0d8e69 100644
--- a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h
+++ b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h
@@ -24,7 +24,7 @@
 #define CGAL_REGULAR_TRIANGULATION_CELL_BASE_3_H
 
 #include <list>
-#include <CGAL/Triangulation_vertex_base_3.h>
+#include <CGAL/Triangulation_cell_base_3.h>
 
 namespace CGAL {