diff --git a/clutter/cogl/cogl-bitmap.h b/clutter/cogl/cogl-bitmap.h
index 1bb3eb3db..e018452a8 100644
--- a/clutter/cogl/cogl-bitmap.h
+++ b/clutter/cogl/cogl-bitmap.h
@@ -28,10 +28,10 @@
 #ifndef __COGL_BITMAP_H__
 #define __COGL_BITMAP_H__
 
-G_BEGIN_DECLS
-
 #include <cogl/cogl-types.h>
 
+G_BEGIN_DECLS
+
 /**
  * SECTION:cogl-bitmap
  * @short_description: Fuctions for loading images but not directly
diff --git a/clutter/cogl/cogl-shader.h b/clutter/cogl/cogl-shader.h
index 4b5648265..cd0bc8c8b 100644
--- a/clutter/cogl/cogl-shader.h
+++ b/clutter/cogl/cogl-shader.h
@@ -28,7 +28,7 @@
 #ifndef __COGL_SHADER_H__
 #define __COGL_SHADER_H__
 
-#include <glib.h>
+#include <cogl/cogl-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/clutter/cogl/cogl-texture.h b/clutter/cogl/cogl-texture.h
index ccf55eb0c..c63041bbd 100644
--- a/clutter/cogl/cogl-texture.h
+++ b/clutter/cogl/cogl-texture.h
@@ -28,10 +28,10 @@
 #ifndef __COGL_TEXTURE_H__
 #define __COGL_TEXTURE_H__
 
-G_BEGIN_DECLS
-
 #include <cogl/cogl-types.h>
 
+G_BEGIN_DECLS
+
 /**
  * SECTION:cogl-texture
  * @short_description: Fuctions for creating and manipulating textures
diff --git a/clutter/cogl/gl/cogl-defines.h.in b/clutter/cogl/gl/cogl-defines.h.in
index 1c0c1636a..100cd74a0 100644
--- a/clutter/cogl/gl/cogl-defines.h.in
+++ b/clutter/cogl/gl/cogl-defines.h.in
@@ -24,6 +24,7 @@
 #ifndef __COGL_DEFINES_H__
 #define __COGL_DEFINES_H__
 
+#include <glib.h>
 #include <@CLUTTER_GL_HEADER@>
 
 G_BEGIN_DECLS
diff --git a/clutter/cogl/gles/cogl-defines.h.in b/clutter/cogl/gles/cogl-defines.h.in
index a40d5d610..d6010509b 100644
--- a/clutter/cogl/gles/cogl-defines.h.in
+++ b/clutter/cogl/gles/cogl-defines.h.in
@@ -26,6 +26,7 @@
 #ifndef __COGL_DEFINES_H__
 #define __COGL_DEFINES_H__
 
+#include <glib.h>
 #include <@CLUTTER_GL_HEADER@>
 
 G_BEGIN_DECLS