diff --git a/src/android/ffi.rs b/src/android/ffi.rs
index a7482e31..78ef0705 100644
--- a/src/android/ffi.rs
+++ b/src/android/ffi.rs
@@ -17,7 +17,12 @@ pub mod egl {
     pub type NativePixmapType = super::EGLNativePixmapType;
     pub type NativeWindowType = super::EGLNativeWindowType;
 
-    generate_gl_bindings!("egl", "core", "1.5", "static")
+    generate_gl_bindings! {
+        api: egl,
+        profile: core,
+        version: 1.5,
+        generator: static
+    }
 }
 
 pub type khronos_utime_nanoseconds_t = khronos_uint64_t;
diff --git a/src/win32/ffi.rs b/src/win32/ffi.rs
index 23859546..5662a988 100644
--- a/src/win32/ffi.rs
+++ b/src/win32/ffi.rs
@@ -7,12 +7,25 @@ use libc;
 
 /// WGL bindings
 pub mod wgl {
-    generate_gl_bindings!("wgl", "core", "1.0", "static")
+    generate_gl_bindings! {
+        api: wgl,
+        profile: core,
+        version: 1.0,
+        generator: static
+    }
 }
 
 /// Functions that are not necessarly always available
 pub mod wgl_extra {
-    generate_gl_bindings!("wgl", "core", "1.0", "struct", [ "WGL_ARB_create_context" ])
+    generate_gl_bindings! {
+        api: wgl,
+        profile: core,
+        version: 1.0,
+        generator: struct,
+        extensions: [
+            WGL_ARB_create_context
+        ]
+    }
 }
 
 // http://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx
diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs
index 39a6ae5f..f6a0a3b2 100644
--- a/src/x11/ffi.rs
+++ b/src/x11/ffi.rs
@@ -8,12 +8,25 @@ use libc;
 
 /// GLX bindings
 pub mod glx {
-    generate_gl_bindings!("glx", "core", "1.4", "static")
+    generate_gl_bindings! {
+        api: glx,
+        profile: core,
+        version: 1.4,
+        generator: static
+    }
 }
 
 /// Functions that are not necessarly always available
 pub mod glx_extra {
-    generate_gl_bindings!("glx", "core", "1.4", "struct", [ "GLX_ARB_create_context" ])
+    generate_gl_bindings! {
+        api: glx,
+        profile: core,
+        version: 1.4,
+        generator: struct,
+        extensions: [
+            GLX_ARB_create_context
+        ]
+    }
 }
 
 pub type Atom = libc::c_ulong;