From bcd9a0141a28379951c96babf0ec4297e87ecef3 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Fri, 24 Sep 2021 20:54:31 +0200
Subject: [PATCH] broadway: Don't include gdkinternals.h

---
 gdk/broadway/broadway-server.c     | 2 +-
 gdk/broadway/gdkbroadway-server.h  | 4 +++-
 gdk/broadway/gdkdisplay-broadway.c | 1 -
 gdk/broadway/gdkdisplay-broadway.h | 1 -
 gdk/broadway/gdkdnd-broadway.c     | 1 -
 gdk/broadway/gdkeventsource.c      | 3 ++-
 gdk/broadway/gdkkeys-broadway.c    | 1 -
 gdk/broadway/gdkprivate-broadway.h | 1 -
 gdk/broadway/gdksurface-broadway.c | 3 +--
 gdk/broadway/gdksurface-broadway.h | 1 -
 10 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/gdk/broadway/broadway-server.c b/gdk/broadway/broadway-server.c
index b54ae55149..b90c849f94 100644
--- a/gdk/broadway/broadway-server.c
+++ b/gdk/broadway/broadway-server.c
@@ -7,7 +7,7 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 #include "gdktypes.h"
-#include "gdkinternals.h"
+#include "gdkdeviceprivate.h"
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
diff --git a/gdk/broadway/gdkbroadway-server.h b/gdk/broadway/gdkbroadway-server.h
index 0dd021103a..d4557d556b 100644
--- a/gdk/broadway/gdkbroadway-server.h
+++ b/gdk/broadway/gdkbroadway-server.h
@@ -2,8 +2,10 @@
 #define __GDK_BROADWAY_SERVER__
 
 #include <gdk/gdktypes.h>
+
+#include "gdkdeviceprivate.h"
+
 #include "broadway-protocol.h"
-#include "gdkinternals.h"
 
 typedef struct _GdkBroadwayServer GdkBroadwayServer;
 typedef struct _GdkBroadwayServerClass GdkBroadwayServerClass;
diff --git a/gdk/broadway/gdkdisplay-broadway.c b/gdk/broadway/gdkdisplay-broadway.c
index 59809ca3e4..f4e77e802b 100644
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -30,7 +30,6 @@
 #include "gdkmonitor-broadway.h"
 #include "gdkseatdefaultprivate.h"
 #include "gdkdevice-broadway.h"
-#include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
 #include <gdk/gdktextureprivate.h>
 #include "gdk-private.h"
diff --git a/gdk/broadway/gdkdisplay-broadway.h b/gdk/broadway/gdkdisplay-broadway.h
index 1747f2cb0b..fddf89bb74 100644
--- a/gdk/broadway/gdkdisplay-broadway.h
+++ b/gdk/broadway/gdkdisplay-broadway.h
@@ -27,7 +27,6 @@
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 #include "gdkbroadway-server.h"
 #include "gdkmonitorprivate.h"
 
diff --git a/gdk/broadway/gdkdnd-broadway.c b/gdk/broadway/gdkdnd-broadway.c
index 7d7ccdc637..d96adce91e 100644
--- a/gdk/broadway/gdkdnd-broadway.c
+++ b/gdk/broadway/gdkdnd-broadway.c
@@ -28,7 +28,6 @@
 
 #include "gdksurfaceprivate.h"
 #include "gdkprivate-broadway.h"
-#include "gdkinternals.h"
 #include "gdkdisplay-broadway.h"
 
 #include <string.h>
diff --git a/gdk/broadway/gdkeventsource.c b/gdk/broadway/gdkeventsource.c
index bc332f9b79..9ae9022a41 100644
--- a/gdk/broadway/gdkeventsource.c
+++ b/gdk/broadway/gdkeventsource.c
@@ -19,8 +19,9 @@
 
 #include "gdkeventsource.h"
 
-#include "gdksurfaceprivate.h"
+#include "gdkeventsprivate.h"
 #include "gdkframeclockprivate.h"
+#include "gdksurfaceprivate.h"
 
 #include <stdlib.h>
 
diff --git a/gdk/broadway/gdkkeys-broadway.c b/gdk/broadway/gdkkeys-broadway.c
index 5fe3719ac7..5ed9d2b352 100644
--- a/gdk/broadway/gdkkeys-broadway.c
+++ b/gdk/broadway/gdkkeys-broadway.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "gdkprivate-broadway.h"
-#include "gdkinternals.h"
 #include "gdkdisplay-broadway.h"
 #include "gdkkeysprivate.h"
 #include "gdkkeysyms.h"
diff --git a/gdk/broadway/gdkprivate-broadway.h b/gdk/broadway/gdkprivate-broadway.h
index 78cab28440..0437cac3bf 100644
--- a/gdk/broadway/gdkprivate-broadway.h
+++ b/gdk/broadway/gdkprivate-broadway.h
@@ -30,7 +30,6 @@
 #define __GDK_PRIVATE_BROADWAY_H__
 
 #include <gdk/gdkcursor.h>
-#include <gdk/gdkinternals.h>
 #include "gdksurface-broadway.h"
 #include "gdkdisplay-broadway.h"
 #include "gdkdrawcontext-broadway.h"
diff --git a/gdk/broadway/gdksurface-broadway.c b/gdk/broadway/gdksurface-broadway.c
index 36930072c4..d341303526 100644
--- a/gdk/broadway/gdksurface-broadway.c
+++ b/gdk/broadway/gdksurface-broadway.c
@@ -35,13 +35,12 @@
 #include "gdkdragsurfaceprivate.h"
 #include "gdkeventsource.h"
 #include "gdkframeclockidleprivate.h"
-#include "gdkinternals.h"
 #include "gdkpopupprivate.h"
 #include "gdkprivate-broadway.h"
+#include "gdkseatprivate.h"
 #include "gdksurfaceprivate.h"
 #include "gdktextureprivate.h"
 #include "gdktoplevelprivate.h"
-#include "gdk-private.h"
 
 #include <graphene.h>
 #include <stdlib.h>
diff --git a/gdk/broadway/gdksurface-broadway.h b/gdk/broadway/gdksurface-broadway.h
index 95cb02ce6d..f944306758 100644
--- a/gdk/broadway/gdksurface-broadway.h
+++ b/gdk/broadway/gdksurface-broadway.h
@@ -27,7 +27,6 @@
 
 #include <gdk/gdksurfaceprivate.h>
 #include "gdkbroadwaysurface.h"
-#include "gdkinternals.h"
 
 G_BEGIN_DECLS