diff --git a/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h b/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h
index 84ab23cb4f3..887be085e27 100644
--- a/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h
+++ b/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph.h
@@ -26,6 +26,7 @@
 #include <CGAL/boost/graph/iterator.h>
 #include <boost/iterator/transform_iterator.hpp>
 
+#include <CGAL/boost/graph/Graph_with_descriptor_with_graph_fwd.h>
 
 namespace CGAL
 {
diff --git a/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph_fwd.h b/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph_fwd.h
new file mode 100644
index 00000000000..1f698a906f6
--- /dev/null
+++ b/BGL/include/CGAL/boost/graph/Graph_with_descriptor_with_graph_fwd.h
@@ -0,0 +1,29 @@
+// Copyright (c) 2017  GeometryFactory (France).  All rights reserved.
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// $URL$
+// $Id$
+//
+//
+// Author(s)     : Laurent Rineau
+
+#ifndef CGAL_BOOST_GRAPH_GWDWG_FWD_H
+#define CGAL_BOOST_GRAPH_GWDWG_FWD_H
+
+namespace CGAL
+{
+  template<typename Graph_>
+  struct Graph_with_descriptor_with_graph;
+}
+
+#endif // CGAL_BOOST_GRAPH_GWDWG_FWD_H
diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
index 0dea45dcd7c..8e90cb7fa87 100644
--- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
@@ -46,6 +46,8 @@
 #include <CGAL/Mesh_3/Profile_counter.h>
 #include <CGAL/boost/graph/helpers.h>
 #include <CGAL/Mesh_3/properties.h>
+#include <CGAL/Surface_mesh/Surface_mesh_fwd.h>
+#include <CGAL/boost/graph/Graph_with_descriptor_with_graph_fwd.h>
 
 #include <boost/optional.hpp>
 #include <boost/none.hpp>