macos: Don't include gdkinternals.h

gdk/macos/GdkMacosBaseView.c

@@ -25,11 +25,11 @@
 #import "GdkMacosBaseView.h"
 #import "GdkMacosWindow.h"
 
-#include "gdkinternals.h"
-
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacossurface-private.h"
 
+#include "gdkdebug.h"
+
 @implementation GdkMacosBaseView
 
 -(id)initWithFrame:(NSRect)frameRect

gdk/macos/GdkMacosCairoSubview.c

@@ -23,7 +23,6 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <cairo-quartz.h>
 
-#include "gdkinternals.h"
 
 #import "GdkMacosCairoSubview.h"
 #import "GdkMacosCairoView.h"

gdk/macos/GdkMacosCairoView.c

@@ -24,7 +24,6 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <cairo-quartz.h>
 
-#include "gdkinternals.h"
 
 #import "GdkMacosCairoView.h"
 #import "GdkMacosCairoSubview.h"

gdk/macos/GdkMacosGLView.c

@@ -23,7 +23,6 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <OpenGL/gl.h>
 
-#include "gdkinternals.h"
 #include "gdkmacossurface-private.h"
 
 #import "GdkMacosGLView.h"

gdk/macos/GdkMacosWindow.c

@@ -37,6 +37,7 @@
 #include "gdkmacostoplevelsurface-private.h"
 #include "gdkmacosutils-private.h"
 
+#include "gdkeventsprivate.h"
 #include "gdkmonitorprivate.h"
 #include "gdksurfaceprivate.h"
 

gdk/macos/gdkmacosdisplay-translate.c

@@ -30,6 +30,8 @@
 #include "gdkmacossurface-private.h"
 #include "gdkmacosseat-private.h"
 
+#include "gdk/gdkeventsprivate.h"
+
 #define GDK_MOD2_MASK (1 << 4)
 #define GRIP_WIDTH 15
 #define GRIP_HEIGHT 15

gdk/macos/gdkmacosdrag.c

@@ -19,16 +19,19 @@
 
 #include "config.h"
 
-#include "gdkdeviceprivate.h"
-#include "gdkintl.h"
-#include "gdk-private.h"
+#include "gdkmacosdrag-private.h"
 
 #include "gdkmacosdevice-private.h"
 #include "gdkmacoscursor-private.h"
 #include "gdkmacosdisplay-private.h"
-#include "gdkmacosdrag-private.h"
 #include "gdkmacosdragsurface-private.h"
 
+#include "gdk/gdkdeviceprivate.h"
+#include "gdk/gdkeventsprivate.h"
+#include "gdk/gdkintl.h"
+#include "gdk/gdkseatprivate.h"
+#include "gdk/gdk-private.h"
+
 #define BIG_STEP 20
 #define SMALL_STEP 1
 #define ANIM_TIME 500000 /* .5 seconds */

gdk/macos/gdkmacoseventsource.c

@@ -27,12 +27,12 @@
 #include <unistd.h>
 
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 
 #include "gdkmacoseventsource-private.h"
 #include "gdkmacosdisplay-private.h"
 
-#include "gdk-private.h"
+#include "gdk/gdkeventsprivate.h"
+#include "gdk/gdk-private.h"
 
 /*
  * This file implementations integration between the GLib main loop and

gdk/macos/gdkmacosglcontext-private.h

@@ -24,7 +24,6 @@
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 
 #include "gdkmacosdisplay.h"
 #include "gdkmacossurface.h"

gdk/macos/gdkmacosglcontext.c

@@ -23,7 +23,6 @@
 #include "gdkmacossurface-private.h"
 #include "gdkmacostoplevelsurface-private.h"
 
-#include "gdkinternals.h"
 #include "gdkintl.h"
 
 #include <OpenGL/gl.h>

gdk/macos/gdkmacospopupsurface.c

@@ -21,12 +21,13 @@
 
 #import "GdkMacosWindow.h"
 
-#include "gdkinternals.h"
+#include "gdkmacospopupsurface-private.h"
+
 #include "gdkpopupprivate.h"
+#include "gdkseatprivate.h"
 
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacosmonitor.h"
-#include "gdkmacospopupsurface-private.h"
 #include "gdkmacosutils-private.h"
 
 struct _GdkMacosPopupSurface

gdk/macos/gdkmacossurface-private.h

@@ -23,7 +23,6 @@
 #include <AppKit/AppKit.h>
 #include <cairo.h>
 
-#include "gdkinternals.h"
 #include "gdksurfaceprivate.h"
 
 #include "gdkmacosdisplay.h"

gdk/macos/gdkmacossurface.c

@@ -25,10 +25,13 @@
 
 #import "GdkMacosCairoView.h"
 
+#include "gdkmacossurface-private.h"
+
 #include "gdkdeviceprivate.h"
 #include "gdkdisplay.h"
+#include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
-#include "gdkinternals.h"
+#include "gdkseatprivate.h"
 #include "gdksurfaceprivate.h"
 
 #include "gdkmacosdevice.h"
@@ -39,7 +42,6 @@
 #include "gdkmacosglcontext-private.h"
 #include "gdkmacosmonitor-private.h"
 #include "gdkmacospopupsurface-private.h"
-#include "gdkmacossurface-private.h"
 #include "gdkmacostoplevelsurface-private.h"
 #include "gdkmacosutils-private.h"
 

gdk/macos/gdkmacostoplevelsurface.c

@@ -21,12 +21,13 @@
 
 #import "GdkMacosWindow.h"
 
-#include "gdkinternals.h"
+#include "gdkmacostoplevelsurface-private.h"
+
+#include "gdkseatprivate.h"
 #include "gdktoplevelprivate.h"
 
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacosmonitor-private.h"
-#include "gdkmacostoplevelsurface-private.h"
 #include "gdkmacosutils-private.h"
 
 static void