diff --git a/bob/io/base/cpp/blitz_array.cpp b/bob/io/base/cpp/blitz_array.cpp
index 4ea4a7c44f1b1906e3f78145e8425145716cf689..9439a4c46abeceb1af564fa91ec24e15c2e6dd77 100644
--- a/bob/io/base/cpp/blitz_array.cpp
+++ b/bob/io/base/cpp/blitz_array.cpp
@@ -8,9 +8,8 @@
  */
 
 #define BOB_IO_BASE_MODULE
-#include <stdexcept>
-
 #include <bob.io.base/blitz_array.h>
+#include <stdexcept>
 
 bob::io::base::array::blitz_array::blitz_array(boost::shared_ptr<blitz_array> other) {
   set(other);
diff --git a/bob/io/base/include/bob.io.base/HDF5Types.h b/bob/io/base/include/bob.io.base/HDF5Types.h
index 81e1b6b574c4c79b297f0f13b128241caed2c97c..01c5cc5e26aa17b0567b6772f725c49ed59cc0c9 100644
--- a/bob/io/base/include/bob.io.base/HDF5Types.h
+++ b/bob/io/base/include/bob.io.base/HDF5Types.h
@@ -10,12 +10,6 @@
 #ifndef BOB_IO_BASE_HDF5TYPES_H
 #define BOB_IO_BASE_HDF5TYPES_H
 
-#include <vector>
-#include <string>
-#include <boost/shared_ptr.hpp>
-#include <blitz/array.h>
-#include <hdf5.h>
-
 /**
  * Checks if the version of HDF5 installed is greater or equal to some set of
  * values. (extracted from hdf5-1.8.7)
@@ -29,6 +23,12 @@
 
 #include <bob.io.base/array.h>
 
+#include <vector>
+#include <string>
+#include <boost/shared_ptr.hpp>
+#include <blitz/array.h>
+#include <hdf5.h>
+
 namespace bob { namespace io { namespace base {
 
   /**
diff --git a/bob/io/base/include/bob.io.base/blitz_array.h b/bob/io/base/include/bob.io.base/blitz_array.h
index 052c30d3d32d29e0870c4ca505d80cd7d75b2fbb..f7841569c9750733c343c855698e837992fce2bf 100644
--- a/bob/io/base/include/bob.io.base/blitz_array.h
+++ b/bob/io/base/include/bob.io.base/blitz_array.h
@@ -11,17 +11,17 @@
 #ifndef BOB_IO_BASE_BLITZ_ARRAY_H
 #define BOB_IO_BASE_BLITZ_ARRAY_H
 
-#include <stdexcept>
-#include <boost/make_shared.hpp>
-#include <boost/format.hpp>
-#include <blitz/array.h>
+#include <bob.io.base/array.h>
+#include <bob.io.base/array_utils.h>
 
 #include <bob.core/check.h>
 #include <bob.core/cast.h>
 #include <bob.core/array_copy.h>
 
-#include <bob.io.base/array.h>
-#include <bob.io.base/array_utils.h>
+#include <stdexcept>
+#include <boost/make_shared.hpp>
+#include <boost/format.hpp>
+#include <blitz/array.h>
 
 namespace bob { namespace io { namespace base { namespace array {
 
diff --git a/setup.py b/setup.py
index 70f76bfe3c95d76b1d9b6f9274f09a23ddeb8bbf..967e9b5657a2bfe93ba85a7ecc426f09a7232747 100644
--- a/setup.py
+++ b/setup.py
@@ -168,9 +168,9 @@ setup(
         ),
       Extension("bob.io.base._library",
         [
+          "bob/io/base/cpp/blitz_array.cpp",
           "bob/io/base/cpp/TensorFileHeader.cpp",
           "bob/io/base/cpp/TensorFile.cpp",
-          "bob/io/base/cpp/blitz_array.cpp",
           "bob/io/base/cpp/CodecRegistry.cpp",
           "bob/io/base/cpp/HDF5Attribute.cpp",
           "bob/io/base/cpp/HDF5Dataset.cpp",