diff --git a/BGL/include/CGAL/boost/graph/Dual.h b/BGL/include/CGAL/boost/graph/Dual.h
index 31e134bae5c..e50bbdaf54f 100644
--- a/BGL/include/CGAL/boost/graph/Dual.h
+++ b/BGL/include/CGAL/boost/graph/Dual.h
@@ -81,8 +81,8 @@ struct property_map<CGAL::Dual<P>, boost::vertex_index_t>
 template <typename P>
 struct property_map<CGAL::Dual<P>, boost::face_index_t>
 {
-  typedef typename property_map<P, CGAL::vertex_index_t>::type type;
-  typedef typename property_map<P, CGAL::vertex_index_t>::const_type const_type;
+  typedef typename property_map<P, boost::vertex_index_t>::type type;
+  typedef typename property_map<P, boost::vertex_index_t>::const_type const_type;
 };
 
 } // namespace boost
@@ -101,7 +101,7 @@ template <typename P>
 typename boost::property_map<P, boost::vertex_index_t>::type
 get(boost::face_index_t, const Dual<P>& dual)
 {
-  return get(CGAL::vertex_index, dual.primal());
+  return get(boost::vertex_index, dual.primal());
 }
 
 
diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_component.cpp b/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_component.cpp
index 6aafbdf3587..ef67206829f 100644
--- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_component.cpp
+++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/connected_component.cpp
@@ -22,7 +22,7 @@ struct Constraint {
 
   Constraint(G & g) : g(&g) { }
 
-  bool operator[](const edge_descriptor& e) const {
+  bool operator[](const edge_descriptor&) const {
     return false; // no constraint
   }
 
diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/Connected_components.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/Connected_components.h
index ac702dbbd48..270f8998169 100644
--- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/Connected_components.h
+++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/Connected_components.h
@@ -366,17 +366,17 @@ namespace Polygon_mesh_processing{
 template <class PolygonMesh>
 std::size_t keep_largest_connected_components(PolygonMesh& pmesh, std::size_t nb_components_to_keep)
 {
-  typedef boost::graph_traits<PolygonMesh>::vertex_descriptor vertex_descriptor;
-  typedef boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor;
-  typedef boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor;
-  typedef boost::graph_traits<PolygonMesh>::edge_descriptor edge_descriptor;
-  boost::vector_property_map<int, boost::property_map<PolygonMesh, boost::face_index_t>::type> face_cc(get(boost::face_index,pmesh));
+  typedef typename boost::graph_traits<PolygonMesh>::vertex_descriptor vertex_descriptor;
+  typedef typename boost::graph_traits<PolygonMesh>::face_descriptor face_descriptor;
+  typedef typename boost::graph_traits<PolygonMesh>::halfedge_descriptor halfedge_descriptor;
+  typedef typename boost::graph_traits<PolygonMesh>::edge_descriptor edge_descriptor;
+  boost::vector_property_map<int, typename boost::property_map<PolygonMesh, boost::face_index_t>::type> face_cc(get(boost::face_index,pmesh));
   
   int num = connected_components(pmesh,face_cc);
   if((num == 1)|| (nb_components_to_keep > num) ){
     return 0;
   }
-  boost::vector_property_map<bool, boost::property_map<PolygonMesh, boost::vertex_index_t>::type> keep_vertex(get(boost::vertex_index,pmesh)); 
+  boost::vector_property_map<bool, typename boost::property_map<PolygonMesh, boost::vertex_index_t>::type> keep_vertex(get(boost::vertex_index,pmesh)); 
   BOOST_FOREACH(vertex_descriptor v, vertices(pmesh)){
     keep_vertex[v] = false;
   }