diff --git a/include/boost/gil/deprecated.hpp b/include/boost/gil/deprecated.hpp
index f157a698c..84f08fef1 100644
--- a/include/boost/gil/deprecated.hpp
+++ b/include/boost/gil/deprecated.hpp
@@ -25,6 +25,8 @@
 ///
 ////////////////////////////////////////////////////////////////////////////////////////
 
+#include <cstddef>
+
 #define planar_ptr          planar_pixel_iterator
 #define planar_ref          planar_pixel_reference
 #define membased_2d_locator memory_based_2d_locator
diff --git a/include/boost/gil/device_n.hpp b/include/boost/gil/device_n.hpp
index daf060251..cf1233430 100644
--- a/include/boost/gil/device_n.hpp
+++ b/include/boost/gil/device_n.hpp
@@ -18,11 +18,13 @@
 /// \brief Support for color space of N channels and variants
 /// \author Lubomir Bourdev and Hailin Jin \n
 ///         Adobe Systems Incorporated
-/// \date 2005-2007 \n Last updated on October 10, 2007
+/// \date 2005-2009 \n Last updated on February 20, 2009
 ////////////////////////////////////////////////////////////////////////////////////////
 
 #include <cstddef>
 #include "gil_config.hpp"
+#include "utilities.hpp"
+#include "metafunctions.hpp"
 #include <boost/type_traits.hpp>
 #include <boost/mpl/range_c.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/include/boost/gil/extension/io/dynamic_io.hpp b/include/boost/gil/extension/io/dynamic_io.hpp
index 09b468702..9f88e50d4 100644
--- a/include/boost/gil/extension/io/dynamic_io.hpp
+++ b/include/boost/gil/extension/io/dynamic_io.hpp
@@ -22,6 +22,7 @@
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/size.hpp>
 #include "../../gil_config.hpp"
+#include "io_error.hpp"
 #include "../dynamic_image/any_image.hpp"
 
 namespace boost { namespace gil {
diff --git a/include/boost/gil/extension/io/jpeg_io_private.hpp b/include/boost/gil/extension/io/jpeg_io_private.hpp
index 6cfc739e9..4b3e7bdd5 100644
--- a/include/boost/gil/extension/io/jpeg_io_private.hpp
+++ b/include/boost/gil/extension/io/jpeg_io_private.hpp
@@ -24,6 +24,7 @@
 #include <vector>
 #include "../../gil_all.hpp"
 #include "io_error.hpp"
+#include <jpeglib.h>
 
 namespace boost { namespace gil {
 
diff --git a/include/boost/gil/extension/io/png_io_private.hpp b/include/boost/gil/extension/io/png_io_private.hpp
index 17fd74d04..0f8d29822 100644
--- a/include/boost/gil/extension/io/png_io_private.hpp
+++ b/include/boost/gil/extension/io/png_io_private.hpp
@@ -23,6 +23,7 @@
 #include <boost/static_assert.hpp>
 #include "../../gil_all.hpp"
 #include "io_error.hpp"
+#include <png.h>
 
 namespace boost { namespace gil {