diff --git a/clutter/win32/clutter-backend-win32.c b/clutter/win32/clutter-backend-win32.c
index 7448ecea7..b4e5e2599 100644
--- a/clutter/win32/clutter-backend-win32.c
+++ b/clutter/win32/clutter-backend-win32.c
@@ -28,6 +28,7 @@
 #include "clutter-backend-win32.h"
 #include "clutter-stage-win32.h"
 #include "clutter-win32.h"
+#include "clutter-device-manager-win32.h"
 
 #include "../clutter-event.h"
 #include "../clutter-main.h"
@@ -66,8 +67,6 @@ static void
 clutter_backend_win32_init_events (ClutterBackend *backend)
 {
   ClutterBackendWin32 *backend_win32 = CLUTTER_BACKEND_WIN32 (backend);
-  ClutterDeviceManager *manager;
-  ClutterInputDevice *device;
 
   CLUTTER_NOTE (EVENT, "initialising the event loop");
 
@@ -229,7 +228,7 @@ clutter_backend_win32_get_features (ClutterBackend *backend)
      for the swap control extension */
   if (getenv ("__GL_SYNC_TO_VBLANK") || check_vblank_env ("default"))
     CLUTTER_NOTE (BACKEND, "vblank sync: left at default at user request");
-  else if (cogl_check_extension ("WGL_EXT_swap_control", extensions)
+  else if (_cogl_check_extension ("WGL_EXT_swap_control", extensions)
 	   && (swap_interval = (SwapIntervalProc)
 	       cogl_get_proc_address ("wglSwapIntervalEXT")))
     {
diff --git a/clutter/win32/clutter-device-manager-win32.c b/clutter/win32/clutter-device-manager-win32.c
index b1121031c..256333e46 100644
--- a/clutter/win32/clutter-device-manager-win32.c
+++ b/clutter/win32/clutter-device-manager-win32.c
@@ -25,25 +25,19 @@
 #include "config.h"
 #endif
 
-#include "clutter-backend-x11.h"
-#include "clutter-device-manager-x11.h"
-#include "clutter-input-device-x11.h"
-#include "clutter-stage-x11.h"
+#include "clutter-backend-win32.h"
+#include "clutter-device-manager-win32.h"
+#include "clutter-device-manager-win32.h"
+#include "clutter-stage-win32.h"
 
 #include "clutter-backend.h"
 #include "clutter-debug.h"
 #include "clutter-device-manager.h"
 #include "clutter-private.h"
 
-#ifdef HAVE_XINPUT
-#include <X11/extensions/XInput.h>
-#endif
-
 enum
 {
-  PROP_0,
-
-  PROP_USE_XINPUT_1
+  PROP_0
 };
 
 G_DEFINE_TYPE (ClutterDeviceManagerWin32,
@@ -155,7 +149,7 @@ static void
 clutter_device_manager_win32_class_init (ClutterDeviceManagerWin32Class *klass)
 {
   ClutterDeviceManagerClass *manager_class;
-  GObjectClass *gobject_class;
+  GObjectClass *gobject_class = (GObjectClass *) klass;
 
   gobject_class->constructed = clutter_device_manager_win32_constructed;
   
diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c
index 4dc2af747..b50209f4e 100644
--- a/clutter/win32/clutter-event-win32.c
+++ b/clutter/win32/clutter-event-win32.c
@@ -334,7 +334,7 @@ message_translate (ClutterBackend *backend,
   ClutterBackendWin32  *backend_win32;
   ClutterStageWin32    *stage_win32;
   ClutterDeviceManager *manager;
-  ClutterInputDevice   *core_device, *core_keyboard;
+  ClutterInputDevice   *core_pointer, *core_keyboard;
   ClutterStage         *stage;
   ClutterStageWindow   *impl;
   gboolean              res;