diff --git a/setup.py b/setup.py
index 2fcf70f6f4f76c89d2dd1bcc8e26266c2498a406..0f9ce0813e189c3d10562ec09d3ccc9a15288bfe 100644
--- a/setup.py
+++ b/setup.py
@@ -4,13 +4,14 @@
 # Mon 16 Apr 08:18:08 2012 CEST
 
 from setuptools import setup, find_packages, dist
-dist.Distribution(dict(setup_requires=['xbob.blitz']))
+dist.Distribution(dict(setup_requires=['xbob.blitz', 'xbob.io']))
 from xbob.blitz.extension import Extension
+import xbob.io
 
 import os
 package_dir = os.path.dirname(os.path.realpath(__file__))
 package_dir = os.path.join(package_dir, 'xbob', 'machine', 'include')
-include_dirs = [package_dir]
+include_dirs = [package_dir, xbob.io.get_include()]
 
 packages = ['bob-machine >= 1.3']
 version = '2.0.0a0'
diff --git a/xbob/machine/include/xbob.machine/api.h b/xbob/machine/include/xbob.machine/api.h
index f27ab6468ea3d13bf46a406b9a12441fbe3fd5d2..1eab3c560318dcd6c4bb40b002f5b91ede955f99 100644
--- a/xbob/machine/include/xbob.machine/api.h
+++ b/xbob/machine/include/xbob.machine/api.h
@@ -88,8 +88,6 @@ typedef struct {
 #    endif
 #  endif
 
-  static void **PyXbobMachine_API;
-
   /**************
    * Versioning *
    **************/
diff --git a/xbob/machine/main.cpp b/xbob/machine/main.cpp
index 4b0147a6a9b15ee39b88d10e624365a0c693f2ce..3750fe6d2a9117b92813b72cfc242436902b992d 100644
--- a/xbob/machine/main.cpp
+++ b/xbob/machine/main.cpp
@@ -5,10 +5,14 @@
  * @brief Bindings to bob::machine
  */
 
+#define XBOB_MACHINE_MODULE
+#include <xbob.machine/api.h>
+
 #ifdef NO_IMPORT_ARRAY
 #undef NO_IMPORT_ARRAY
 #endif
-#include <xbob.machine/api.h>
+#include <xbob.blitz/capi.h>
+#include <xbob.io/api.h>
 
 static PyMethodDef library_methods[] = {
     {0}  /* Sentinel */