diff --git a/cogl/cogl/cogl-display.c b/cogl/cogl/cogl-display.c
index 54387a00d..9dc7b6aea 100644
--- a/cogl/cogl/cogl-display.c
+++ b/cogl/cogl/cogl-display.c
@@ -81,7 +81,7 @@ cogl_display_class_init (CoglDisplayClass *class)
 }
 
 CoglDisplay *
-cogl_display_new (CoglRenderer         *renderer)
+cogl_display_new (CoglRenderer *renderer)
 {
   g_return_val_if_fail (renderer != NULL, NULL);
 
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-private.h b/cogl/cogl/winsys/cogl-winsys-egl-private.h
index d08055350..35a42e23f 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@@ -80,8 +80,8 @@ typedef struct _CoglWinsysEGLVtable
   (* context_deinit) (CoglContext *context);
 
   int
-  (* add_config_attributes) (CoglDisplay                 *display,
-                             EGLint                      *attributes);
+  (* add_config_attributes) (CoglDisplay *display,
+                             EGLint      *attributes);
   gboolean
   (* choose_config) (CoglDisplay *display,
                      EGLint *attributes,
@@ -199,5 +199,5 @@ _cogl_winsys_egl_renderer_connect_common (CoglRenderer *renderer,
                                           GError **error);
 
 COGL_EXPORT void
-cogl_display_egl_determine_attributes (CoglDisplay                 *display,
-                                       EGLint                      *attributes);
+cogl_display_egl_determine_attributes (CoglDisplay *display,
+                                       EGLint      *attributes);
diff --git a/cogl/cogl/winsys/cogl-winsys-egl-x11.c b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
index fd18af314..a7a7ead39 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@@ -260,8 +260,8 @@ error:
 }
 
 static int
-_cogl_winsys_egl_add_config_attributes (CoglDisplay                 *display,
-                                        EGLint                      *attributes)
+_cogl_winsys_egl_add_config_attributes (CoglDisplay *display,
+                                        EGLint      *attributes)
 {
   int i = 0;
 
diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
index e8791c72d..7a9d6cbfc 100644
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -189,8 +189,8 @@ _cogl_winsys_renderer_connect (CoglRenderer *renderer,
 }
 
 void
-cogl_display_egl_determine_attributes (CoglDisplay                 *display,
-                                       EGLint                      *attributes)
+cogl_display_egl_determine_attributes (CoglDisplay *display,
+                                       EGLint      *attributes)
 {
   CoglRenderer *renderer = display->renderer;
   CoglRendererEGL *egl_renderer = renderer->winsys;
diff --git a/cogl/cogl/winsys/cogl-winsys-glx-private.h b/cogl/cogl/winsys/cogl-winsys-glx-private.h
index 5d80c1326..9b28584a0 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-glx-private.h
@@ -34,9 +34,9 @@ COGL_EXPORT const CoglWinsysVtable *
 _cogl_winsys_glx_get_vtable (void);
 
 gboolean
-cogl_display_glx_find_fbconfig (CoglDisplay                  *display,
-                                GLXFBConfig                  *config_ret,
-                                GError                      **error);
+cogl_display_glx_find_fbconfig (CoglDisplay  *display,
+                                GLXFBConfig  *config_ret,
+                                GError      **error);
 
 void
 cogl_context_glx_set_current_drawable (CoglContext *context,
diff --git a/cogl/cogl/winsys/cogl-winsys-glx.c b/cogl/cogl/winsys/cogl-winsys-glx.c
index e3ee3b629..0a3658d36 100644
--- a/cogl/cogl/winsys/cogl-winsys-glx.c
+++ b/cogl/cogl/winsys/cogl-winsys-glx.c
@@ -493,8 +493,8 @@ update_winsys_features (CoglContext *context, GError **error)
 }
 
 static void
-glx_attributes_from_framebuffer_config (CoglDisplay                 *display,
-                                        int                         *attributes)
+glx_attributes_from_framebuffer_config (CoglDisplay *display,
+                                        int         *attributes)
 {
   int i = 0;
 
@@ -529,9 +529,9 @@ glx_attributes_from_framebuffer_config (CoglDisplay                 *display,
  * we could overload as an indication of error, so we have to return
  * an explicit boolean status. */
 gboolean
-cogl_display_glx_find_fbconfig (CoglDisplay                  *display,
-                                GLXFBConfig                  *config_ret,
-                                GError                      **error)
+cogl_display_glx_find_fbconfig (CoglDisplay  *display,
+                                GLXFBConfig  *config_ret,
+                                GError      **error)
 {
   CoglXlibRenderer *xlib_renderer =
     _cogl_xlib_renderer_get_data (display->renderer);
diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
index ff912910b..1578088cd 100644
--- a/src/backends/native/meta-renderer-native.c
+++ b/src/backends/native/meta-renderer-native.c
@@ -337,8 +337,8 @@ fail:
 }
 
 static int
-meta_renderer_native_add_egl_config_attributes (CoglDisplay                 *cogl_display,
-                                                EGLint                      *attributes)
+meta_renderer_native_add_egl_config_attributes (CoglDisplay *cogl_display,
+                                                EGLint      *attributes)
 {
   CoglRendererEGL *cogl_renderer_egl = cogl_display->renderer->winsys;
   MetaRendererNativeGpuData *renderer_gpu_data = cogl_renderer_egl->platform;