diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 31cfcadb1b..fe7079c005 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -25,6 +25,7 @@
 #include "gdkwin32display.h"
 #include "gdkwin32screen.h"
 #include "gdkwin32window.h"
+#include "gdkwin32.h"
 
 #define HAVE_MONITOR_INFO
 
@@ -383,7 +384,9 @@ inner_clipboard_window_procedure (HWND   hwnd,
       {
         int success;
         HWND hwndOwner;
+#ifdef G_ENABLE_DEBUG
         UINT nFormat = 0;
+#endif
         GdkEvent *event;
         GdkWindow *owner;
 
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index b3932a1e62..2627e79635 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -2613,8 +2613,6 @@ gdk_event_translate (MSG  *msg,
 
      case WM_MOUSEACTIVATE:
        {
-	 GdkWindow *tmp;
-
 	 if (gdk_window_get_window_type (window) == GDK_WINDOW_TEMP 
 	     || !window->accept_focus)
 	   {
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 7456de21f7..c039c9ef39 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -404,7 +404,7 @@ gboolean   _gdk_win32_display_set_selection_owner   (GdkDisplay *display,
 						     guint32     time,
 						     gboolean    send_event);
 void       _gdk_win32_display_send_selection_notify (GdkDisplay      *display,
-						     HWND             requestor,
+						     GdkWindow       *requestor,
 						     GdkAtom   	      selection,
 						     GdkAtom          target,
 						     GdkAtom          property,
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index af38356443..ebfbc2b41e 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -874,7 +874,7 @@ _gdk_selection_property_delete (GdkWindow *window)
 
 void
 _gdk_win32_display_send_selection_notify (GdkDisplay   *display,
-					  HWND          requestor,
+					  GdkWindow    *requestor,
 					  GdkAtom     	selection,
 					  GdkAtom     	target,
 					  GdkAtom     	property,
diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 4985103a01..3c3cf6e6dc 100644
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -870,7 +870,9 @@ adjust_for_gravity_hints (GdkWindow *window,
 
   if (impl->hint_flags & GDK_HINT_WIN_GRAVITY)
     {
+#ifdef G_ENABLE_DEBUG
       gint orig_x = *x, orig_y = *y;
+#endif
 
       switch (impl->hints.win_gravity)
 	{
@@ -933,7 +935,6 @@ show_window_internal (GdkWindow *window,
 		      gboolean   deiconify)
 {
   GdkWindowImplWin32 *window_impl;
-  HWND old_active_window;
   gboolean focus_on_map = FALSE;
   DWORD exstyle;