diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index d52fdd292b..e3860a972d 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -192,7 +192,6 @@ libgdk_3_la_LIBADD += quartz/libgdk-quartz.la
 endif # USE_QUARTZ
 
 if USE_WIN32
-libgdk_3_la_SOURCES += gdkkeynames.c
 libgdk_3_la_LIBADD += win32/libgdk-win32.la
 libgdk_3_la_DEPENDENCIES = win32/libgdk-win32.la win32/rc/gdk-win32-res.o
 libgdk_3_la_LDFLAGS += -Wl,win32/rc/gdk-win32-res.o
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index a0cd1e5f47..28b2745266 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -263,7 +263,6 @@ gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon,
   } bmi;
   HDC hdc;
   guchar *pixels, *bits;
-  gchar buf[32];
   gint rowstride, x, y, w, h;
 
   if (!GDI_CALL (GetIconInfo, (hicon, &ii)))
diff --git a/gdk/win32/gdkdevice-virtual.c b/gdk/win32/gdkdevice-virtual.c
index a48024f22f..4062992e87 100644
--- a/gdk/win32/gdkdevice-virtual.c
+++ b/gdk/win32/gdkdevice-virtual.c
@@ -92,10 +92,6 @@ gdk_device_virtual_class_init (GdkDeviceVirtualClass *klass)
 static void
 gdk_device_virtual_init (GdkDeviceVirtual *device_virtual)
 {
-  GdkDevice *device;
-
-  device = GDK_DEVICE (device_virtual);
-
 }
 
 void
diff --git a/gdk/win32/gdkdevice-wintab.c b/gdk/win32/gdkdevice-wintab.c
index 199e7aa90c..e411bfd28d 100644
--- a/gdk/win32/gdkdevice-wintab.c
+++ b/gdk/win32/gdkdevice-wintab.c
@@ -91,9 +91,6 @@ gdk_device_wintab_class_init (GdkDeviceWintabClass *klass)
 static void
 gdk_device_wintab_init (GdkDeviceWintab *device_wintab)
 {
-  GdkDevice *device;
-
-  device = GDK_DEVICE (device_wintab);
 }
 
 static gboolean
diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c
index fa064bb2a7..41433a8770 100644
--- a/gdk/win32/gdkdevicemanager-win32.c
+++ b/gdk/win32/gdkdevicemanager-win32.c
@@ -882,7 +882,6 @@ _gdk_input_other_event (GdkEvent  *event,
                         GdkWindow *window)
 {
   GdkDeviceManagerWin32 *device_manager;
-  GdkDisplay *display;
   GdkDeviceWintab *source_device = NULL;
   GdkDeviceGrabInfo *last_grab;
   GdkDevice *device = NULL;
@@ -914,7 +913,6 @@ _gdk_input_other_event (GdkEvent  *event,
     window = _gdk_root;
 
   g_object_ref (window);
-  display = gdk_window_get_display (window);
 
   GDK_NOTE (EVENTS_OR_INPUT,
 	    g_print ("_gdk_input_other_event: window=%p %+d%+d\n",
diff --git a/gdk/win32/gdkdnd-win32.c b/gdk/win32/gdkdnd-win32.c
index 9646674693..6a7690eec1 100644
--- a/gdk/win32/gdkdnd-win32.c
+++ b/gdk/win32/gdkdnd-win32.c
@@ -825,7 +825,6 @@ idataobject_getdata (LPDATAOBJECT This,
 		     LPSTGMEDIUM  pMedium)
 {
   data_object *ctx = (data_object *) This;
-  GdkAtom target;
   HRESULT hr;
   GdkEvent e;
 
@@ -844,8 +843,6 @@ idataobject_getdata (LPDATAOBJECT This,
   active_pFormatEtc = pFormatEtc;
   active_pMedium = pMedium;
 
-  target = GDK_TARGET_STRING;
-
   e.type = GDK_SELECTION_REQUEST;
   e.selection.window = ctx->context->source_window;
   e.selection.send_event = FALSE; /* ??? */
diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index 8d1d90eb0c..bb2af328a3 100644
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1852,7 +1852,7 @@ gdk_event_translate (MSG  *msg,
   GdkWindow *window = NULL;
   GdkWindowImplWin32 *impl;
 
-  GdkWindow *orig_window, *new_window;
+  GdkWindow *new_window;
 
   GdkDeviceManager *device_manager;
   GdkDeviceManagerWin32 *device_manager_win32;
@@ -1884,7 +1884,6 @@ gdk_event_translate (MSG  *msg,
     }
 
   window = gdk_win32_handle_table_lookup (msg->hwnd);
-  orig_window = window;
 
   if (window == NULL)
     {
diff --git a/gdk/win32/gdkgeometry-win32.c b/gdk/win32/gdkgeometry-win32.c
index 749305c4ca..df53152a32 100644
--- a/gdk/win32/gdkgeometry-win32.c
+++ b/gdk/win32/gdkgeometry-win32.c
@@ -56,13 +56,9 @@ _gdk_window_move_resize_child (GdkWindow *window,
 			       gint       width,
 			       gint       height)
 {
-  GdkWindowImplWin32 *impl;
-
   g_return_if_fail (window != NULL);
   g_return_if_fail (GDK_IS_WINDOW (window));
 
-  impl = GDK_WINDOW_IMPL_WIN32 (window->impl);
-
   GDK_NOTE (MISC, g_print ("_gdk_window_move_resize_child: %s@%+d%+d %dx%d@%+d%+d\n",
 			   _gdk_win32_window_description (window),
 			   window->x, window->y, width, height, x, y));
diff --git a/gtk/gtksearchenginesimple.c b/gtk/gtksearchenginesimple.c
index 355ba9227c..14750584a2 100644
--- a/gtk/gtksearchenginesimple.c
+++ b/gtk/gtksearchenginesimple.c
@@ -122,6 +122,7 @@ search_thread_data_new (GtkSearchEngineSimple *engine,
   return data;
 }
 
+#ifdef HAVE_FTW_H
 static void 
 search_thread_data_free (SearchThreadData *data)
 {
@@ -153,7 +154,6 @@ typedef struct
   SearchThreadData *thread_data;
 } SearchHits;
 
-
 static gboolean
 search_thread_add_hits_idle (gpointer user_data)
 {
@@ -197,7 +197,6 @@ send_batch (SearchThreadData *data)
 
 static GPrivate search_thread_data;
 
-#ifdef HAVE_FTW_H
 static int
 search_visit_func (const char        *fpath,
 		   const struct stat *sb,
@@ -272,9 +271,8 @@ search_visit_func (const char        *fpath,
 static gpointer 
 search_thread_func (gpointer user_data)
 {
-  guint id;
-
 #ifdef HAVE_FTW_H
+  guint id;
   SearchThreadData *data;
   
   data = user_data;
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 7549c8d9ab..d35c1811c3 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -2799,7 +2799,9 @@ settings_update_cursor_theme (GtkSettings *settings)
 {
   gchar *theme = NULL;
   gint size = 0;
+#if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND)
   GdkDisplay *display = gdk_screen_get_display (settings->priv->screen);
+#endif
 
   g_object_get (settings,
                 "gtk-cursor-theme-name", &theme,
diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 043b00fdc4..e016ccba9f 100644
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -2545,16 +2545,17 @@ void
 gtk_status_icon_set_tooltip_markup (GtkStatusIcon *status_icon,
 				    const gchar   *markup)
 {
+#ifdef GDK_WINDOWING_X11
   GtkStatusIconPrivate *priv;
-#ifndef GDK_WINDOWING_X11
+#else
   gchar *text = NULL;
 #endif
 
   g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
 
+#ifdef GDK_WINDOWING_X11
   priv = status_icon->priv;
 
-#ifdef GDK_WINDOWING_X11
   if (priv->tray_icon)
     gtk_widget_set_tooltip_markup (priv->tray_icon, markup);
 #endif
@@ -2732,13 +2733,15 @@ void
 gtk_status_icon_set_name (GtkStatusIcon *status_icon,
                           const gchar   *name)
 {
+#ifdef GDK_WINDOWING_X11
   GtkStatusIconPrivate *priv;
+#endif
 
   g_return_if_fail (GTK_IS_STATUS_ICON (status_icon));
 
+#ifdef GDK_WINDOWING_X11
   priv = status_icon->priv;
 
-#ifdef GDK_WINDOWING_X11
   if (priv->tray_icon)
     {
       if (gtk_widget_get_realized (priv->tray_icon))
diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 7884926d3e..383da0eedd 100644
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -81,10 +81,6 @@ gtk_win32_embed_widget_class_init (GtkWin32EmbedWidgetClass *class)
 static void
 gtk_win32_embed_widget_init (GtkWin32EmbedWidget *embed_widget)
 {
-  GtkWindow *window;
-
-  window = GTK_WINDOW (embed_widget);
-
   _gtk_widget_set_is_toplevel (GTK_WIDGET (embed_widget), TRUE);
   gtk_container_set_resize_mode (GTK_CONTAINER (embed_widget), GTK_RESIZE_QUEUE);
 }
diff --git a/modules/input/gtkimcontextime.c b/modules/input/gtkimcontextime.c
index aac572e989..5d2c15a329 100644
--- a/modules/input/gtkimcontextime.c
+++ b/modules/input/gtkimcontextime.c
@@ -657,7 +657,7 @@ gtk_im_context_ime_focus_in (GtkIMContext *context)
   GtkIMContextIME *context_ime = GTK_IM_CONTEXT_IME (context);
   GdkWindow *toplevel;
   GtkWidget *widget = NULL;
-  HWND hwnd, top_hwnd;
+  HWND hwnd;
   HIMC himc;
 
   if (!GDK_IS_WINDOW (context_ime->client_window))
@@ -676,8 +676,6 @@ gtk_im_context_ime_focus_in (GtkIMContext *context)
     {
       gdk_window_add_filter (toplevel,
                              gtk_im_context_ime_message_filter, context_ime);
-      top_hwnd = gdk_win32_window_get_impl_hwnd (toplevel);
-
       context_ime->toplevel = toplevel;
     }
   else
@@ -730,7 +728,7 @@ gtk_im_context_ime_focus_out (GtkIMContext *context)
   GtkIMContextIME *context_ime = GTK_IM_CONTEXT_IME (context);
   GdkWindow *toplevel;
   GtkWidget *widget = NULL;
-  HWND hwnd, top_hwnd;
+  HWND hwnd;
   HIMC himc;
 
   if (!GDK_IS_WINDOW (context_ime->client_window))
@@ -801,8 +799,6 @@ gtk_im_context_ime_focus_out (GtkIMContext *context)
       gdk_window_remove_filter (toplevel,
                                 gtk_im_context_ime_message_filter,
                                 context_ime);
-      top_hwnd = gdk_win32_window_get_impl_hwnd (toplevel);
-
       context_ime->toplevel = NULL;
     }
   else
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 6126c750a3..9176fc6852 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -4925,8 +4925,10 @@ create_cursors (GtkWidget *widget)
   GtkWidget *label;
   GtkWidget *any;
   GtkAdjustment *adjustment;
+#ifdef GDK_WINDOWING_X11
   GtkWidget *entry;
   GtkWidget *size;  
+#endif
 
   if (!window)
     {
diff --git a/testsuite/gdk/encoding.c b/testsuite/gdk/encoding.c
index 546bf29fae..6ae96095d6 100644
--- a/testsuite/gdk/encoding.c
+++ b/testsuite/gdk/encoding.c
@@ -6,11 +6,11 @@
 static void
 test_to_text_list (void)
 {
+#ifdef GDK_WINDOWING_X11
   GdkDisplay *display;
 
   display = gdk_display_get_default ();
 
-#ifdef GDK_WINDOWING_X11
   if (GDK_IS_X11_DISPLAY (display))
     {
       GdkAtom encoding;