diff --git a/gtk/src/gtk_preferences.cpp b/gtk/src/gtk_preferences.cpp
index c3572d1e..22a64ce1 100644
--- a/gtk/src/gtk_preferences.cpp
+++ b/gtk/src/gtk_preferences.cpp
@@ -21,8 +21,8 @@ gboolean
 snes9x_preferences_open (GtkWidget *widget,
                          gpointer  data)
 {
-    Snes9xWindow      *window = ((Snes9xWindow *) data);
-    Snes9xConfig      *config = window->config;
+    Snes9xWindow *window = ((Snes9xWindow *) data);
+    Snes9xConfig *config = window->config;
 
     window->pause_from_focus_change ();
 
@@ -58,10 +58,10 @@ event_calibrate (GtkButton *widget, gpointer data)
 static void
 event_control_toggle (GtkToggleButton *widget, gpointer data)
 {
-    Snes9xPreferences    *window = (Snes9xPreferences *) data;
-    static bool          toggle_lock = false;
-    const gchar          *name;
-    bool                 state;
+    Snes9xPreferences *window = (Snes9xPreferences *) data;
+    static bool       toggle_lock = false;
+    const gchar       *name;
+    bool              state;
 
     if (toggle_lock)
     {
@@ -193,9 +193,9 @@ event_shader_select (GtkButton *widget, gpointer data)
 {
 #ifdef USE_OPENGL
     Snes9xPreferences *window = (Snes9xPreferences *) data;
-    GtkWidget     *dialog;
-    gint          result;
-    GtkEntry      *entry;
+    GtkWidget *dialog;
+    gint      result;
+    GtkEntry  *entry;
 
     entry = GTK_ENTRY (window->get_widget ("fragment_shader"));
 
diff --git a/gtk/src/gtk_s9xwindow.cpp b/gtk/src/gtk_s9xwindow.cpp
index 542dad1d..5525aa89 100644
--- a/gtk/src/gtk_s9xwindow.cpp
+++ b/gtk/src/gtk_s9xwindow.cpp
@@ -1820,11 +1820,6 @@ Snes9xWindow::center_mouse ()
 #if GTK_MAJOR_VERSION < 3
     gdk_display_warp_pointer (gdk_display, gdk_screen, mouse_reported_x,
                               mouse_reported_y);
-#elif GTK_MINOR_VERSION < 20
-    GdkDeviceManager *manager = gdk_display_get_device_manager (gdk_display);
-    GdkDevice *pointer = gdk_device_manager_get_client_pointer (manager);
-
-    gdk_device_warp (pointer, gdk_screen, mouse_reported_x, mouse_reported_y);
 #else
     GdkSeat *seat = gdk_display_get_default_seat (gdk_display);
     GdkDevice *pointer = gdk_seat_get_pointer (seat);
@@ -1854,15 +1849,6 @@ Snes9xWindow::toggle_grab_mouse ()
         if (config->pointer_is_visible)
             show_mouse_cursor ();
     }
-#elif GTK_MINOR_VERSION < 20
-    GdkDeviceManager *manager = gdk_display_get_device_manager (gdk_display);
-    GdkDevice *pointer = gdk_device_manager_get_client_pointer (manager);
-
-    if (!mouse_grabbed)
-        gdk_device_grab (pointer, gdk_window, GDK_OWNERSHIP_NONE, true,
-                         (GdkEventMask) 1020, empty_cursor, GDK_CURRENT_TIME);
-    else
-        gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
 #else
     GdkSeat *seat = gdk_display_get_default_seat (gdk_display);