diff --git a/include/boost/graph/bandwidth.hpp b/include/boost/graph/bandwidth.hpp
index 9d08ea54c..e3f99adf5 100644
--- a/include/boost/graph/bandwidth.hpp
+++ b/include/boost/graph/bandwidth.hpp
@@ -10,6 +10,7 @@
 #include <algorithm> // for std::min and std::max
 #include <boost/config.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/detail/numeric_traits.hpp>
 
 namespace boost
diff --git a/include/boost/graph/chrobak_payne_drawing.hpp b/include/boost/graph/chrobak_payne_drawing.hpp
index fc3ca40d3..68106267c 100644
--- a/include/boost/graph/chrobak_payne_drawing.hpp
+++ b/include/boost/graph/chrobak_payne_drawing.hpp
@@ -14,6 +14,7 @@
 #include <stack>
 #include <boost/config.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/property_map/property_map.hpp>
 
 namespace boost
diff --git a/include/boost/graph/circle_layout.hpp b/include/boost/graph/circle_layout.hpp
index f30ee65be..f295bd20b 100644
--- a/include/boost/graph/circle_layout.hpp
+++ b/include/boost/graph/circle_layout.hpp
@@ -14,6 +14,7 @@
 #include <boost/graph/graph_traits.hpp>
 #include <boost/graph/iteration_macros.hpp>
 #include <boost/graph/topology.hpp>
+#include <boost/property_map/property_map.hpp>
 #include <boost/static_assert.hpp>
 
 namespace boost
diff --git a/include/boost/graph/detail/index.hpp b/include/boost/graph/detail/index.hpp
index 1565c57c8..7ffc843fc 100644
--- a/include/boost/graph/detail/index.hpp
+++ b/include/boost/graph/detail/index.hpp
@@ -8,6 +8,7 @@
 #define BOOST_GRAPH_DETAIL_INDEX_HPP
 
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 
 // The structures in this module are responsible for selecting and defining
 // types for accessing a builting index map. Note that the selection of these
diff --git a/include/boost/graph/dimacs.hpp b/include/boost/graph/dimacs.hpp
index 584e3056b..d6171d243 100644
--- a/include/boost/graph/dimacs.hpp
+++ b/include/boost/graph/dimacs.hpp
@@ -18,6 +18,7 @@
 #include <vector>
 #include <queue>
 #include <boost/assert.hpp>
+#include <boost/throw_exception.hpp>
 
 namespace boost
 {
diff --git a/include/boost/graph/edge_connectivity.hpp b/include/boost/graph/edge_connectivity.hpp
index 975d329f5..25e7d85a5 100644
--- a/include/boost/graph/edge_connectivity.hpp
+++ b/include/boost/graph/edge_connectivity.hpp
@@ -16,6 +16,7 @@
 #include <vector>
 #include <set>
 #include <algorithm>
+#include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/edmonds_karp_max_flow.hpp>
 
 namespace boost
diff --git a/include/boost/graph/graph_mutability_traits.hpp b/include/boost/graph/graph_mutability_traits.hpp
index 333a026d2..064f32ff3 100644
--- a/include/boost/graph/graph_mutability_traits.hpp
+++ b/include/boost/graph/graph_mutability_traits.hpp
@@ -11,6 +11,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/and.hpp>
 #include <boost/mpl/bool.hpp>
+#include <boost/type_traits/is_convertible.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 namespace boost
diff --git a/include/boost/graph/graph_stats.hpp b/include/boost/graph/graph_stats.hpp
index 00c84dd86..aff1f3550 100644
--- a/include/boost/graph/graph_stats.hpp
+++ b/include/boost/graph/graph_stats.hpp
@@ -11,7 +11,9 @@
 
 #include <map>
 #include <list>
+#include <boost/graph/graph_traits.hpp>
 #include <boost/graph/iteration_macros.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/assert.hpp>
 
 namespace boost
diff --git a/include/boost/graph/labeled_graph.hpp b/include/boost/graph/labeled_graph.hpp
index 6346e5041..c3467ad0c 100644
--- a/include/boost/graph/labeled_graph.hpp
+++ b/include/boost/graph/labeled_graph.hpp
@@ -18,7 +18,9 @@
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_unsigned.hpp>
 #include <boost/pending/container_traits.hpp>
+#include <boost/graph/adjacency_list.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/property_map/property_map.hpp>
 
 // This file implements a utility for creating mappings from arbitrary
 // identifiers to the vertices of a graph.
diff --git a/include/boost/graph/metis.hpp b/include/boost/graph/metis.hpp
index e6d4c4626..e6567c999 100644
--- a/include/boost/graph/metis.hpp
+++ b/include/boost/graph/metis.hpp
@@ -24,6 +24,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <boost/throw_exception.hpp>
+
 namespace boost
 {
 namespace graph
diff --git a/include/boost/graph/planar_canonical_ordering.hpp b/include/boost/graph/planar_canonical_ordering.hpp
index f1bf7b773..61f2797a1 100644
--- a/include/boost/graph/planar_canonical_ordering.hpp
+++ b/include/boost/graph/planar_canonical_ordering.hpp
@@ -14,6 +14,7 @@
 #include <boost/config.hpp>
 #include <boost/next_prior.hpp>
 #include <boost/graph/graph_traits.hpp>
+#include <boost/graph/properties.hpp>
 #include <boost/property_map/property_map.hpp>
 
 namespace boost
diff --git a/include/boost/graph/point_traits.hpp b/include/boost/graph/point_traits.hpp
index 310515f6f..c81b9ed6f 100644
--- a/include/boost/graph/point_traits.hpp
+++ b/include/boost/graph/point_traits.hpp
@@ -9,6 +9,8 @@
 #ifndef BOOST_GRAPH_POINT_TRAITS_HPP
 #define BOOST_GRAPH_POINT_TRAITS_HPP
 
+#include <cstddef>
+
 namespace boost
 {
 namespace graph
diff --git a/include/boost/graph/small_world_generator.hpp b/include/boost/graph/small_world_generator.hpp
index 9c73b5474..f2d0d084a 100644
--- a/include/boost/graph/small_world_generator.hpp
+++ b/include/boost/graph/small_world_generator.hpp
@@ -11,6 +11,7 @@
 
 #include <iterator>
 #include <utility>
+#include <boost/graph/graph_traits.hpp>
 #include <boost/random/uniform_01.hpp>
 #include <boost/random/uniform_int.hpp>
 
diff --git a/include/boost/graph/ssca_graph_generator.hpp b/include/boost/graph/ssca_graph_generator.hpp
index 5fb6e3566..a2281236c 100644
--- a/include/boost/graph/ssca_graph_generator.hpp
+++ b/include/boost/graph/ssca_graph_generator.hpp
@@ -15,6 +15,7 @@
 #include <queue>
 #include <boost/config.hpp>
 #include <boost/random/uniform_int.hpp>
+#include <boost/random/uniform_01.hpp>
 #include <boost/graph/graph_traits.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/type_traits/is_same.hpp>
diff --git a/include/boost/graph/write_dimacs.hpp b/include/boost/graph/write_dimacs.hpp
index ec0e2c532..36ab7f81e 100644
--- a/include/boost/graph/write_dimacs.hpp
+++ b/include/boost/graph/write_dimacs.hpp
@@ -41,6 +41,8 @@
 #include <string>
 #include <ostream>
 
+#include <boost/graph/graph_traits.hpp>
+
 namespace boost
 {