diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 1b2944ed..246262c7 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -1080,8 +1080,8 @@ fe_gui_info_ptr (session *sess, int info_type)
 	switch (info_type)
 	{
 	case 0:	/* native window pointer (for plugins) */
-#ifdef WIN32
-		return gdk_win32_window_get_impl_hwnd (gtk_widget_get_window (sess->gui->window));
+#ifdef GDK_WINDOWING_WIN32
+		return gdk_win32_window_get_handle (gtk_widget_get_window (sess->gui->window));
 #else
 		return sess->gui->window;
 #endif
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 22463555..364ec24f 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -752,9 +752,7 @@ gtkutil_treeview_get_selected (GtkTreeView *view, GtkTreeIter *iter_ret, ...)
 gboolean
 gtkutil_tray_icon_supported (GtkWindow *window)
 {
-#ifndef GDK_WINDOWING_X11
-	return TRUE;
-#else
+#ifdef GDK_WINDOWING_X11
 	GdkScreen *screen = gtk_window_get_screen (window);
 	GdkDisplay *display = gdk_screen_get_display (screen);
 	int screen_number = gdk_screen_get_number (screen);
@@ -772,6 +770,8 @@ gtkutil_tray_icon_supported (GtkWindow *window)
 	g_free (selection_name);
 
 	return (tray_window != None);
+#else
+	return TRUE;
 #endif
 }