diff --git a/bindings-directfb.cabal b/bindings-directfb.cabal
--- a/bindings-directfb.cabal
+++ b/bindings-directfb.cabal
@@ -1,41 +1,39 @@
 cabal-version: >= 1.2.3
 name: bindings-directfb
-homepage: http://bitbucket.org/mauricio/bindings-directfb
 synopsis:
   Low level bindings to DirectFB
-version: 0.0.1
+version: 0.0.2
 license: BSD3
 license-file: LICENSE
 maintainer: Maurício C. Antunes <mauricio.antunes@gmail.com>
 author: Maurício C. Antunes
 build-type: Simple
-bug-reports: http://bitbucket.org/mauricio/bindings-directfb/issues
+bug-reports: http://bitbucket.org/mauricio/bindings-dsl/issues
 category: FFI
-stability: Affected by GHC ticket #2615
 library
   hs-source-dirs: src
   extensions:
     ForeignFunctionInterface
   build-depends:
     base >=3 && <5,
-    bindings-common >=1 && <2,
-    bindings-posix >=1.2 && <1.3
+    bindings-DSL >=1.0.6 && <1.1,
+    bindings-posix >=1.2.2 && <1.3
   exposed-modules:
     Bindings.DirectFB
-    Bindings.DirectFB.Types
     Bindings.DirectFB.IDirectFB
-    Bindings.DirectFB.IDirectFBSurface
-    Bindings.DirectFB.IDirectFBPalette
-    Bindings.DirectFB.IDirectFBInputDevice
+    Bindings.DirectFB.IDirectFBDataBuffer
     Bindings.DirectFB.IDirectFBDisplayLayer
-    Bindings.DirectFB.IDirectFBWindow
     Bindings.DirectFB.IDirectFBEventBuffer
     Bindings.DirectFB.IDirectFBFont
+    Bindings.DirectFB.IDirectFBGL
     Bindings.DirectFB.IDirectFBImageProvider
-    Bindings.DirectFB.IDirectFBVideoProvider
-    Bindings.DirectFB.IDirectFBDataBuffer
+    Bindings.DirectFB.IDirectFBInputDevice
+    Bindings.DirectFB.IDirectFBPalette
     Bindings.DirectFB.IDirectFBScreen
-    Bindings.DirectFB.IDirectFBGL
+    Bindings.DirectFB.IDirectFBSurface
+    Bindings.DirectFB.IDirectFBVideoProvider
+    Bindings.DirectFB.IDirectFBWindow
+    Bindings.DirectFB.Types
   pkgconfig-depends:
-    directfb >=1.2.7 && <2
+    directfb >=1.2.8 && <2
   c-sources: src/inlines.c
diff --git a/src/Bindings/DirectFB.hs b/src/Bindings/DirectFB.hs
--- a/src/Bindings/DirectFB.hs
+++ b/src/Bindings/DirectFB.hs
@@ -1,33 +1,1 @@
--- | <http://directfb.org>
-
-module Bindings.DirectFB (
-  module Bindings.DirectFB.IDirectFBDataBuffer,
-  module Bindings.DirectFB.IDirectFBDisplayLayer,
-  module Bindings.DirectFB.IDirectFBEventBuffer,
-  module Bindings.DirectFB.IDirectFBFont,
-  module Bindings.DirectFB.IDirectFBGL,
-  module Bindings.DirectFB.IDirectFB,
-  module Bindings.DirectFB.IDirectFBImageProvider,
-  module Bindings.DirectFB.IDirectFBInputDevice,
-  module Bindings.DirectFB.IDirectFBPalette,
-  module Bindings.DirectFB.IDirectFBScreen,
-  module Bindings.DirectFB.IDirectFBSurface,
-  module Bindings.DirectFB.IDirectFBVideoProvider,
-  module Bindings.DirectFB.IDirectFBWindow,
-  module Bindings.DirectFB.Types,
- ) where
-import Prelude ()
-import Bindings.DirectFB.IDirectFBDataBuffer
-import Bindings.DirectFB.IDirectFBDisplayLayer
-import Bindings.DirectFB.IDirectFBEventBuffer
-import Bindings.DirectFB.IDirectFBFont
-import Bindings.DirectFB.IDirectFBGL
-import Bindings.DirectFB.IDirectFB
-import Bindings.DirectFB.IDirectFBImageProvider
-import Bindings.DirectFB.IDirectFBInputDevice
-import Bindings.DirectFB.IDirectFBPalette
-import Bindings.DirectFB.IDirectFBScreen
-import Bindings.DirectFB.IDirectFBSurface
-import Bindings.DirectFB.IDirectFBVideoProvider
-import Bindings.DirectFB.IDirectFBWindow
-import Bindings.DirectFB.Types
+module Bindings.DirectFB (module Bindings.DirectFB.IDirectFBDataBuffer,module Bindings.DirectFB.IDirectFBDisplayLayer,module Bindings.DirectFB.IDirectFBEventBuffer,module Bindings.DirectFB.IDirectFBFont,module Bindings.DirectFB.IDirectFBGL,module Bindings.DirectFB.IDirectFB,module Bindings.DirectFB.IDirectFBImageProvider,module Bindings.DirectFB.IDirectFBInputDevice,module Bindings.DirectFB.IDirectFBPalette,module Bindings.DirectFB.IDirectFBScreen,module Bindings.DirectFB.IDirectFBSurface,module Bindings.DirectFB.IDirectFBVideoProvider,module Bindings.DirectFB.IDirectFBWindow,module Bindings.DirectFB.Types) where {import Bindings.DirectFB.IDirectFBDataBuffer;import Bindings.DirectFB.IDirectFBDisplayLayer;import Bindings.DirectFB.IDirectFBEventBuffer;import Bindings.DirectFB.IDirectFBFont;import Bindings.DirectFB.IDirectFBGL;import Bindings.DirectFB.IDirectFB;import Bindings.DirectFB.IDirectFBImageProvider;import Bindings.DirectFB.IDirectFBInputDevice;import Bindings.DirectFB.IDirectFBPalette;import Bindings.DirectFB.IDirectFBScreen;import Bindings.DirectFB.IDirectFBSurface;import Bindings.DirectFB.IDirectFBVideoProvider;import Bindings.DirectFB.IDirectFBWindow;import Bindings.DirectFB.Types}
diff --git a/src/Bindings/DirectFB/IDirectFB.hsc b/src/Bindings/DirectFB/IDirectFB.hsc
--- a/src/Bindings/DirectFB/IDirectFB.hsc
+++ b/src/Bindings/DirectFB/IDirectFB.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFB.html>
diff --git a/src/Bindings/DirectFB/IDirectFBDataBuffer.hsc b/src/Bindings/DirectFB/IDirectFBDataBuffer.hsc
--- a/src/Bindings/DirectFB/IDirectFBDataBuffer.hsc
+++ b/src/Bindings/DirectFB/IDirectFBDataBuffer.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBDataBuffer.html>
diff --git a/src/Bindings/DirectFB/IDirectFBDisplayLayer.hsc b/src/Bindings/DirectFB/IDirectFBDisplayLayer.hsc
--- a/src/Bindings/DirectFB/IDirectFBDisplayLayer.hsc
+++ b/src/Bindings/DirectFB/IDirectFBDisplayLayer.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBDisplayLayer.html>
diff --git a/src/Bindings/DirectFB/IDirectFBEventBuffer.hsc b/src/Bindings/DirectFB/IDirectFBEventBuffer.hsc
--- a/src/Bindings/DirectFB/IDirectFBEventBuffer.hsc
+++ b/src/Bindings/DirectFB/IDirectFBEventBuffer.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBEventBuffer.html>
diff --git a/src/Bindings/DirectFB/IDirectFBFont.hsc b/src/Bindings/DirectFB/IDirectFBFont.hsc
--- a/src/Bindings/DirectFB/IDirectFBFont.hsc
+++ b/src/Bindings/DirectFB/IDirectFBFont.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBFont.html>
diff --git a/src/Bindings/DirectFB/IDirectFBGL.hsc b/src/Bindings/DirectFB/IDirectFBGL.hsc
--- a/src/Bindings/DirectFB/IDirectFBGL.hsc
+++ b/src/Bindings/DirectFB/IDirectFBGL.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 #include <directfbgl.h>
 
diff --git a/src/Bindings/DirectFB/IDirectFBImageProvider.hsc b/src/Bindings/DirectFB/IDirectFBImageProvider.hsc
--- a/src/Bindings/DirectFB/IDirectFBImageProvider.hsc
+++ b/src/Bindings/DirectFB/IDirectFBImageProvider.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBImageProvider.html>
diff --git a/src/Bindings/DirectFB/IDirectFBInputDevice.hsc b/src/Bindings/DirectFB/IDirectFBInputDevice.hsc
--- a/src/Bindings/DirectFB/IDirectFBInputDevice.hsc
+++ b/src/Bindings/DirectFB/IDirectFBInputDevice.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBInputDevice.html>
diff --git a/src/Bindings/DirectFB/IDirectFBPalette.hsc b/src/Bindings/DirectFB/IDirectFBPalette.hsc
--- a/src/Bindings/DirectFB/IDirectFBPalette.hsc
+++ b/src/Bindings/DirectFB/IDirectFBPalette.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBPalette.html>
diff --git a/src/Bindings/DirectFB/IDirectFBScreen.hsc b/src/Bindings/DirectFB/IDirectFBScreen.hsc
--- a/src/Bindings/DirectFB/IDirectFBScreen.hsc
+++ b/src/Bindings/DirectFB/IDirectFBScreen.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBScreen.html>
diff --git a/src/Bindings/DirectFB/IDirectFBSurface.hsc b/src/Bindings/DirectFB/IDirectFBSurface.hsc
--- a/src/Bindings/DirectFB/IDirectFBSurface.hsc
+++ b/src/Bindings/DirectFB/IDirectFBSurface.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBSurface.html>
diff --git a/src/Bindings/DirectFB/IDirectFBVideoProvider.hsc b/src/Bindings/DirectFB/IDirectFBVideoProvider.hsc
--- a/src/Bindings/DirectFB/IDirectFBVideoProvider.hsc
+++ b/src/Bindings/DirectFB/IDirectFBVideoProvider.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBVideoProvider.html>
diff --git a/src/Bindings/DirectFB/IDirectFBWindow.hsc b/src/Bindings/DirectFB/IDirectFBWindow.hsc
--- a/src/Bindings/DirectFB/IDirectFBWindow.hsc
+++ b/src/Bindings/DirectFB/IDirectFBWindow.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 
 -- | <http://directfb.org/docs/DirectFB_Reference_1_4/IDirectFBWindow.html>
diff --git a/src/Bindings/DirectFB/Types.hsc b/src/Bindings/DirectFB/Types.hsc
--- a/src/Bindings/DirectFB/Types.hsc
+++ b/src/Bindings/DirectFB/Types.hsc
@@ -1,4 +1,4 @@
-#include <bindings.macros.h>
+#include <bindings.dsl.h>
 #include <directfb.h>
 #include <directfb_version.h>
 #include <directfbgl.h>
diff --git a/src/inlines.c b/src/inlines.c
--- a/src/inlines.c
+++ b/src/inlines.c
@@ -1,2 +1,3 @@
+#include <bindings.cmacros.h>
 #include <directfb.h>