gdk: Don't include gdkinternals.h in gdk-private.h

11 files changed, 25 insertions, 10 deletions

diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
index 2985815fdc..5b0955e5b8 100644
--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@ -1,7 +1,7 @@
 #ifndef __GDK__PRIVATE_H__
 #define __GDK__PRIVATE_H__
 
-#include "gdk/gdkinternals.h"
+#include "gdk/gdktypes.h"
 
 /* Private API for use in GTK+ */
 
diff --git a/gdk/gdkdebug.h b/gdk/gdkdebug.h
index 4386c220eb..82332e6fb5 100644
--- a/gdk/gdkdebug.h
+++ b/gdk/gdkdebug.h
@@ -18,8 +18,11 @@
 #ifndef __GDK_DEBUG_H__
 #define __GDK_DEBUG_H__
 
-G_BEGIN_DECLS
+#include <glib.h>
+
+#include "gdktypes.h"
 
+G_BEGIN_DECLS
 
 typedef enum {
   GDK_DEBUG_MISC            = 1 <<  0,
diff --git a/gdk/gdktoplevel.c b/gdk/gdktoplevel.c
index f020d81765..dd49c1e25d 100644
--- a/gdk/gdktoplevel.c
+++ b/gdk/gdktoplevel.c
@@ -19,10 +19,12 @@
 
 #include "config.h"
 
-#include "gdkintl.h"
-#include "gdk-private.h"
 #include "gdktoplevelprivate.h"
 
+#include "gdkdisplay.h"
+#include "gdkenumtypes.h"
+#include "gdkintl.h"
+
 #include <graphene-gobject.h>
 #include <math.h>
 
@@ -670,7 +672,7 @@ gdk_toplevel_begin_resize (GdkToplevel    *toplevel,
 
   if (device == NULL)
     {
-      GdkSeat *seat = gdk_display_get_default_seat (GDK_SURFACE (toplevel)->display);
+      GdkSeat *seat = gdk_display_get_default_seat (gdk_surface_get_display (GDK_SURFACE (toplevel)));
       if (button == 0)
         device = gdk_seat_get_keyboard (seat);
       else
@@ -711,7 +713,7 @@ gdk_toplevel_begin_move (GdkToplevel *toplevel,
 
   if (device == NULL)
     {
-      GdkSeat *seat = gdk_display_get_default_seat (GDK_SURFACE (toplevel)->display);
+      GdkSeat *seat = gdk_display_get_default_seat (gdk_surface_get_display (GDK_SURFACE (toplevel)));
       if (button == 0)
         device = gdk_seat_get_keyboard (seat);
       else
diff --git a/gtk/gtkimcontext.c b/gtk/gtkimcontext.c
index c0796612b2..7fd23f8da6 100644
--- a/gtk/gtkimcontext.c
+++ b/gtk/gtkimcontext.c
@@ -23,6 +23,8 @@
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 
+#include "gdk/gdkeventsprivate.h"
+
 /**
  * GtkIMContext:
  *
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index cb14e44e0f..515219b493 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -33,6 +33,8 @@
 #include "gtkimmoduleprivate.h"
 
 #include "gtkimcontextsimpleseqs.h"
+
+#include "gdk/gdkeventsprivate.h"
 #include "gdk/gdkprofilerprivate.h"
 
 /**
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index e498822212..830c074b2b 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -70,6 +70,9 @@
 
 #include "inspector/window.h"
 
+#include "gdk/gdkeventsprivate.h"
+#include "gdk/gdksurfaceprivate.h"
+
 #define GDK_ARRAY_ELEMENT_TYPE GtkWidget *
 #define GDK_ARRAY_TYPE_NAME GtkWidgetStack
 #define GDK_ARRAY_NAME gtk_widget_stack
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 706afc9108..244fedcd7a 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -132,6 +132,8 @@
 #include "gsk/gskroundedrectprivate.h"
 #include "gtkcssshadowvalueprivate.h"
 
+#include "gdk/gdksurfaceprivate.h"
+
 #define MNEMONICS_DELAY 300 /* ms */
 
 #define TAIL_GAP_WIDTH  24
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 3898487964..6ae7cef9fb 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -68,9 +68,9 @@
 
 #include "inspector/window.h"
 
-#include "gdk/gdktextureprivate.h"
-#include "gdk/gdk-private.h"
 #include "gdk/gdkprofilerprivate.h"
+#include "gdk/gdksurfaceprivate.h"
+#include "gdk/gdktextureprivate.h"
 
 #include <cairo-gobject.h>
 #include <errno.h>
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 8d1fc9f44c..ea8e617fa7 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -34,6 +34,7 @@
 #include "gtkbinlayout.h"
 #include "gtkmediafileprivate.h"
 
+#include "gdk/gdkdebug.h"
 
 #ifdef GDK_WINDOWING_X11
 #include "x11/gdkx.h"
diff --git a/gtk/inspector/visual.c b/gtk/inspector/visual.c
index 04351bafc9..9a2e445354 100644
--- a/gtk/inspector/visual.c
+++ b/gtk/inspector/visual.c
@@ -59,7 +59,7 @@
 #include "broadway/gdkbroadway.h"
 #endif
 
-#include "gdk/gdk-private.h"
+#include "gdk/gdkdebug.h"
 
 #define EPSILON               1e-10
 
diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c
index 6bc0df080a..1690951140 100644
--- a/gtk/inspector/window.c
+++ b/gtk/inspector/window.c
@@ -48,8 +48,8 @@
 #include "general.h"
 #include "logs.h"
 
+#include "gdkdebug.h"
 #include "gdkmarshalers.h"
-#include "gdk-private.h"
 #include "gskrendererprivate.h"
 #include "gtkbutton.h"
 #include "gtkcsswidgetnodeprivate.h"