diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index c41c171164..b10a7df738 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -793,7 +793,7 @@ gtk_paned_init (GtkPaned *paned)
   priv->handle_pos.y = -1;
 
   gesture = gtk_gesture_pan_new (GTK_WIDGET (paned),
-                                 GTK_PAN_ORIENTATION_HORIZONTAL);
+                                 GTK_ORIENTATION_HORIZONTAL);
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
   g_signal_connect (gesture, "drag-begin",
                     G_CALLBACK (pan_gesture_drag_begin_cb), paned);
@@ -824,13 +824,13 @@ gtk_paned_set_property (GObject        *object,
         {
           priv->cursor_type = GDK_SB_H_DOUBLE_ARROW;
           gtk_gesture_pan_set_orientation (GTK_GESTURE_PAN (priv->pan_gesture),
-                                           GTK_PAN_ORIENTATION_HORIZONTAL);
+                                           GTK_ORIENTATION_HORIZONTAL);
         }
       else
         {
           priv->cursor_type = GDK_SB_V_DOUBLE_ARROW;
           gtk_gesture_pan_set_orientation (GTK_GESTURE_PAN (priv->pan_gesture),
-                                           GTK_PAN_ORIENTATION_VERTICAL);
+                                           GTK_ORIENTATION_VERTICAL);
         }
 
       /* state_flags_changed updates the cursor */
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 6880b84835..1b5c4dfabc 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -733,9 +733,9 @@ gtk_scrolled_window_check_attach_pan_gesture (GtkScrolledWindow *sw)
       GtkOrientation orientation;
 
       if (priv->hscrollbar_visible)
-        orientation = GTK_PAN_ORIENTATION_HORIZONTAL;
+        orientation = GTK_ORIENTATION_HORIZONTAL;
       else
-        orientation = GTK_PAN_ORIENTATION_VERTICAL;
+        orientation = GTK_ORIENTATION_VERTICAL;
 
       gtk_gesture_pan_set_orientation (GTK_GESTURE_PAN (priv->pan_gesture),
                                        orientation);
@@ -783,7 +783,7 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window)
                             G_CALLBACK (scrolled_window_drag_end_cb),
                             scrolled_window);
 
-  priv->pan_gesture = gtk_gesture_pan_new (widget, GTK_PAN_ORIENTATION_VERTICAL);
+  priv->pan_gesture = gtk_gesture_pan_new (widget, GTK_ORIENTATION_VERTICAL);
   gtk_gesture_group (priv->pan_gesture, priv->drag_gesture);
   gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->pan_gesture), 1);
 
diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
index 3330ea96f8..7038d09ee8 100644
--- a/gtk/gtkswitch.c
+++ b/gtk/gtkswitch.c
@@ -928,7 +928,7 @@ gtk_switch_init (GtkSwitch *self)
   self->priv->multipress_gesture = gesture;
 
   gesture = gtk_gesture_pan_new (GTK_WIDGET (self),
-                                 GTK_PAN_ORIENTATION_HORIZONTAL);
+                                 GTK_ORIENTATION_HORIZONTAL);
   gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
   gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (gesture), TRUE);
   g_signal_connect (gesture, "pan",