[gtk/wip/otte/gdk-headers: 7/8] wayland: Don't include gdkinternals.h

[Benjamin Otte <otte src gnome org>]

commit b6afa95fe3ba8f5616ad44132ff33a514c293485
Author: Benjamin Otte <otte redhat com>
Date:   Fri Sep 24 21:49:38 2021 +0200

    wayland: Don't include gdkinternals.h

 gdk/wayland/gdkapplaunchcontext-wayland.c |  1 -
 gdk/wayland/gdkcairocontext-wayland.c     |  1 -
 gdk/wayland/gdkdevice-wayland.c           | 25 +++++++++++++------------
 gdk/wayland/gdkdisplay-wayland.h          |  1 -
 gdk/wayland/gdkdrag-wayland.c             |  1 -
 gdk/wayland/gdkdrop-wayland.c             |  1 -
 gdk/wayland/gdkeventsource.c              |  3 ++-
 gdk/wayland/gdkglcontext-wayland.c        |  1 -
 gdk/wayland/gdkglcontext-wayland.h        |  1 -
 gdk/wayland/gdkprivate-wayland.h          |  1 -
 gdk/wayland/gdksurface-wayland.c          |  1 +
 gdk/wayland/gdkvulkancontext-wayland.c    |  1 -
 12 files changed, 16 insertions(+), 22 deletions(-)
---
diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
index 1e0b1b94c2..c9498e507c 100644
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
@@ -26,7 +26,6 @@
 #include "gdkwayland.h"
 #include "gdkprivate-wayland.h"
 #include "gdkapplaunchcontextprivate.h"
-#include "gdkinternals.h"
 #include "gdkintl.h"
 
 typedef struct {
diff --git a/gdk/wayland/gdkcairocontext-wayland.c b/gdk/wayland/gdkcairocontext-wayland.c
index 819daa140e..4ce7134327 100644
--- a/gdk/wayland/gdkcairocontext-wayland.c
+++ b/gdk/wayland/gdkcairocontext-wayland.c
@@ -22,7 +22,6 @@
 
 #include "gdkprivate-wayland.h"
 
-#include "gdkinternals.h"
 #include "gdkprofilerprivate.h"
 
 static const cairo_user_data_key_t gdk_wayland_cairo_context_key;
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index dc876b1f9a..fdfb8968c0 100644
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -17,28 +17,25 @@
 
 #include "config.h"
 
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
+#include "gdkdevice-wayland-private.h"
 
-#include <string.h>
-#include "gdksurfaceprivate.h"
-#include "gdktypes.h"
 #include "gdkclipboard-wayland.h"
 #include "gdkclipboardprivate.h"
-#include "gdkprivate-wayland.h"
-#include "gdkseat-wayland.h"
-#include "gdkwayland.h"
-#include "gdkkeysyms.h"
-#include "gdkkeysprivate.h"
 #include "gdkcursorprivate.h"
 #include "gdkdeviceprivate.h"
 #include "gdkdevicepadprivate.h"
 #include "gdkdevicetoolprivate.h"
-#include "gdkdevice-wayland-private.h"
 #include "gdkdropprivate.h"
+#include "gdkeventsprivate.h"
+#include "gdkkeysprivate.h"
+#include "gdkkeysyms.h"
 #include "gdkprimary-wayland.h"
+#include "gdkprivate-wayland.h"
+#include "gdkseat-wayland.h"
 #include "gdkseatprivate.h"
+#include "gdksurfaceprivate.h"
+#include "gdktypes.h"
+#include "gdkwayland.h"
 #include "gdk-private.h"
 
 #include "pointer-gestures-unstable-v1-client-protocol.h"
@@ -46,6 +43,10 @@
 
 #include <xkbcommon/xkbcommon.h>
 
+#include <errno.h>
+#include <fcntl.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/time.h>
 #include <sys/mman.h>
 #if defined(HAVE_DEV_EVDEV_INPUT_H)
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index 66e8020b28..932f39cb6c 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -42,7 +42,6 @@
 #include <glib.h>
 #include <gdk/gdkkeys.h>
 #include <gdk/gdksurface.h>
-#include <gdk/gdkinternals.h>
 #include <gdk/gdk.h>           /* For gdk_get_program_class() */
 
 #include "gdkdisplayprivate.h"
diff --git a/gdk/wayland/gdkdrag-wayland.c b/gdk/wayland/gdkdrag-wayland.c
index 55521353c3..f017b8474f 100644
--- a/gdk/wayland/gdkdrag-wayland.c
+++ b/gdk/wayland/gdkdrag-wayland.c
@@ -19,7 +19,6 @@
 
 #include "gdkdragprivate.h"
 
-#include "gdkinternals.h"
 #include "gdkprivate-wayland.h"
 #include "gdkcontentformats.h"
 #include "gdkdisplay-wayland.h"
diff --git a/gdk/wayland/gdkdrop-wayland.c b/gdk/wayland/gdkdrop-wayland.c
index 5d72b3fcf6..8234096adb 100644
--- a/gdk/wayland/gdkdrop-wayland.c
+++ b/gdk/wayland/gdkdrop-wayland.c
@@ -19,7 +19,6 @@
 
 #include "gdkdropprivate.h"
 
-#include "gdkinternals.h"
 #include "gdkprivate-wayland.h"
 #include "gdkcontentformats.h"
 #include "gdkdisplay-wayland.h"
diff --git a/gdk/wayland/gdkeventsource.c b/gdk/wayland/gdkeventsource.c
index 6f761f0ab7..3ec81a13ff 100644
--- a/gdk/wayland/gdkeventsource.c
+++ b/gdk/wayland/gdkeventsource.c
@@ -17,9 +17,10 @@
 
 #include "config.h"
 
-#include "gdkinternals.h"
 #include "gdkprivate-wayland.h"
 
+#include "gdkeventsprivate.h"
+
 #include <unistd.h>
 #include <errno.h>
 
diff --git a/gdk/wayland/gdkglcontext-wayland.c b/gdk/wayland/gdkglcontext-wayland.c
index f007ac6576..c6401ccbf2 100644
--- a/gdk/wayland/gdkglcontext-wayland.c
+++ b/gdk/wayland/gdkglcontext-wayland.c
@@ -31,7 +31,6 @@
 #include "gdkwaylandsurface.h"
 #include "gdkprivate-wayland.h"
 
-#include "gdkinternals.h"
 #include "gdk-private.h"
 #include "gdksurfaceprivate.h"
 #include "gdkprofilerprivate.h"
diff --git a/gdk/wayland/gdkglcontext-wayland.h b/gdk/wayland/gdkglcontext-wayland.h
index 0a60a467be..04a7053bb4 100644
--- a/gdk/wayland/gdkglcontext-wayland.h
+++ b/gdk/wayland/gdkglcontext-wayland.h
@@ -25,7 +25,6 @@
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 
 #include <epoxy/egl.h>
 
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index 09f41606f3..df072b4f8f 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -38,7 +38,6 @@
 
 #include <xkbcommon/xkbcommon.h>
 
-#include "gdkinternals.h"
 
 #define WL_SURFACE_HAS_BUFFER_SCALE 3
 #define WL_POINTER_HAS_FRAME 5
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index 84ec54a335..4d1951e66d 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -22,6 +22,7 @@
 #include "gdkdeviceprivate.h"
 #include "gdkdisplay-wayland.h"
 #include "gdkdragsurfaceprivate.h"
+#include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
 #include "gdkglcontext-wayland.h"
 #include "gdkmonitor-wayland.h"
diff --git a/gdk/wayland/gdkvulkancontext-wayland.c b/gdk/wayland/gdkvulkancontext-wayland.c
index ee88e8e66c..3e6c1086b3 100644
--- a/gdk/wayland/gdkvulkancontext-wayland.c
+++ b/gdk/wayland/gdkvulkancontext-wayland.c
@@ -26,7 +26,6 @@
 
 #include "gdkvulkancontext-wayland.h"
 
-#include "gdkinternals.h"
 #include "gdkwaylanddisplay.h"
 #include "gdkwaylandsurface.h"
 #include "gdkprivate-wayland.h"