diff --git a/include/boost/gil/extension/numeric/algorithm.hpp b/include/boost/gil/extension/numeric/algorithm.hpp
index 8dd285085..90afa0317 100644
--- a/include/boost/gil/extension/numeric/algorithm.hpp
+++ b/include/boost/gil/extension/numeric/algorithm.hpp
@@ -8,6 +8,8 @@
 #ifndef BOOST_GIL_EXTENSION_NUMERIC_ALGORITHM_HPP
 #define BOOST_GIL_EXTENSION_NUMERIC_ALGORITHM_HPP
 
+#include <boost/gil/extension/numeric/pixel_numeric_operations.hpp>
+
 #include <boost/gil/metafunctions.hpp>
 #include <boost/gil/pixel_iterator.hpp>
 
diff --git a/include/boost/gil/extension/numeric/channel_numeric_operations.hpp b/include/boost/gil/extension/numeric/channel_numeric_operations.hpp
index d456f06eb..73942b38c 100644
--- a/include/boost/gil/extension/numeric/channel_numeric_operations.hpp
+++ b/include/boost/gil/extension/numeric/channel_numeric_operations.hpp
@@ -8,6 +8,8 @@
 #ifndef BOOST_GIL_EXTENSION_NUMERIC_CHANNEL_NUMERIC_OPERATIONS_HPP
 #define BOOST_GIL_EXTENSION_NUMERIC_CHANNEL_NUMERIC_OPERATIONS_HPP
 
+#include <boost/gil/channel.hpp>
+
 #include <functional>
 
 namespace boost { namespace gil {
diff --git a/include/boost/gil/extension/toolbox/color_spaces/hsl.hpp b/include/boost/gil/extension/toolbox/color_spaces/hsl.hpp
index a2fb502b9..12cf8ba80 100644
--- a/include/boost/gil/extension/toolbox/color_spaces/hsl.hpp
+++ b/include/boost/gil/extension/toolbox/color_spaces/hsl.hpp
@@ -8,6 +8,7 @@
 #ifndef BOOST_GIL_EXTENSION_TOOLBOX_COLOR_SPACES_HSL_HPP
 #define BOOST_GIL_EXTENSION_TOOLBOX_COLOR_SPACES_HSL_HPP
 
+#include <boost/gil/color_convert.hpp>
 #include <boost/gil/typedefs.hpp>
 
 namespace boost{ namespace gil {
diff --git a/include/boost/gil/extension/toolbox/color_spaces/hsv.hpp b/include/boost/gil/extension/toolbox/color_spaces/hsv.hpp
index 2de937806..94e8bccdd 100644
--- a/include/boost/gil/extension/toolbox/color_spaces/hsv.hpp
+++ b/include/boost/gil/extension/toolbox/color_spaces/hsv.hpp
@@ -10,6 +10,7 @@
 
 #include <boost/numeric/conversion/cast.hpp>
 
+#include <boost/gil/color_convert.hpp>
 #include <boost/gil/typedefs.hpp>
 
 #include <boost/mpl/vector.hpp>
diff --git a/include/boost/gil/extension/toolbox/color_spaces/lab.hpp b/include/boost/gil/extension/toolbox/color_spaces/lab.hpp
index b0aa898f1..464e2fb24 100644
--- a/include/boost/gil/extension/toolbox/color_spaces/lab.hpp
+++ b/include/boost/gil/extension/toolbox/color_spaces/lab.hpp
@@ -10,6 +10,7 @@
 
 #include <boost/gil/extension/toolbox/color_spaces/xyz.hpp>
 
+#include <boost/gil/color_convert.hpp>
 #include <boost/gil.hpp> // FIXME: Include what you use, not everything, even in extensions!
 
 #include <boost/mpl/vector.hpp>
diff --git a/include/boost/gil/extension/toolbox/color_spaces/xyz.hpp b/include/boost/gil/extension/toolbox/color_spaces/xyz.hpp
index 9924d18e0..ea543345f 100644
--- a/include/boost/gil/extension/toolbox/color_spaces/xyz.hpp
+++ b/include/boost/gil/extension/toolbox/color_spaces/xyz.hpp
@@ -8,6 +8,7 @@
 #ifndef BOOST_GIL_EXTENSION_TOOLBOX_COLOR_SPACES_XYZ_HPP
 #define BOOST_GIL_EXTENSION_TOOLBOX_COLOR_SPACES_XYZ_HPP
 
+#include <boost/gil/color_convert.hpp>
 #include <boost/gil/typedefs.hpp>
 
 #include <boost/mpl/vector.hpp>
diff --git a/include/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp b/include/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp
index 8648c1857..d933ce90a 100644
--- a/include/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp
+++ b/include/boost/gil/extension/toolbox/color_spaces/ycbcr.hpp
@@ -10,6 +10,7 @@
 
 #include <boost/gil/extension/toolbox/metafunctions/get_num_bits.hpp>
 
+#include <boost/gil/color_convert.hpp>
 #include <boost/gil.hpp> // FIXME: Include what you use!
 
 #include <boost/mpl/identity.hpp>
diff --git a/include/boost/gil/extension/toolbox/image_types/indexed_image.hpp b/include/boost/gil/extension/toolbox/image_types/indexed_image.hpp
index 4ee7966f3..4b78eda7c 100644
--- a/include/boost/gil/extension/toolbox/image_types/indexed_image.hpp
+++ b/include/boost/gil/extension/toolbox/image_types/indexed_image.hpp
@@ -12,6 +12,7 @@
 
 #include <boost/gil/image.hpp>
 #include <boost/gil/point.hpp>
+#include <boost/gil/virtual_locator.hpp>
 
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_integral.hpp>