diff --git a/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/driver/gl/cogl-framebuffer-gl.c
index 12eed4343..18c9371d6 100644
--- a/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/driver/gl/cogl-framebuffer-gl.c
@@ -33,6 +33,7 @@
 #include "cogl-buffer-gl-private.h"
 #include "cogl-error-private.h"
 #include "cogl-texture-gl-private.h"
+#include "cogl-texture-private.h"
 
 #include <glib.h>
 #include <string.h>
diff --git a/cogl/winsys/cogl-winsys-wgl.c b/cogl/winsys/cogl-winsys-wgl.c
index e6686d86b..33e7ad2f2 100644
--- a/cogl/winsys/cogl-winsys-wgl.c
+++ b/cogl/winsys/cogl-winsys-wgl.c
@@ -45,6 +45,7 @@
 #include "cogl-feature-private.h"
 #include "cogl-win32-renderer.h"
 #include "cogl-winsys-wgl-private.h"
+#include "cogl-error-private.h"
 
 typedef struct _CoglRendererWgl
 {
@@ -416,8 +417,8 @@ create_window_class (CoglDisplay *display, CoglError **error)
   if (wgl_display->window_class == 0)
     {
       _cogl_set_error (error, COGL_WINSYS_ERROR,
-                   COGL_WINSYS_ERROR_CREATE_CONTEXT,
-                   "Unable to register window class");
+                       COGL_WINSYS_ERROR_CREATE_CONTEXT,
+                       "Unable to register window class");
       return FALSE;
     }
 
@@ -617,7 +618,8 @@ update_winsys_features (CoglContext *context, CoglError **error)
 
   if (wgl_extensions)
     {
-      char **split_extensions = g_strsplit (wgl_extensions);
+      char **split_extensions =
+        g_strsplit (wgl_extensions, " ", 0 /* max_tokens */);
 
       COGL_NOTE (WINSYS, "  WGL Extensions: %s", wgl_extensions);
 
@@ -644,9 +646,7 @@ update_winsys_features (CoglContext *context, CoglError **error)
 static CoglBool
 _cogl_winsys_context_init (CoglContext *context, CoglError **error)
 {
-  CoglContextWgl *wgl_context;
-
-  wgl_context = context->winsys = g_new0 (CoglContextWgl, 1);
+  context->winsys = g_new0 (CoglContextWgl, 1);
 
   cogl_win32_renderer_add_filter (context->display->renderer,
                                   win32_event_filter_cb,
diff --git a/tests/conform/test-wrap-rectangle-textures.c b/tests/conform/test-wrap-rectangle-textures.c
index 7fee76590..bb8bf6911 100644
--- a/tests/conform/test-wrap-rectangle-textures.c
+++ b/tests/conform/test-wrap-rectangle-textures.c
@@ -1,5 +1,4 @@
 #include <cogl/cogl.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <string.h>