From e9d4b0dda09684472f0f407124f4b55962a7dcd5 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Tue, 7 Sep 2021 11:08:11 -0700
Subject: [PATCH] Move includes of gdkinternal-quartz.h from headers to impl
 files.

gdkinternal-quartz.h isn't installed but the headers that included
it are, which which would cause the build to fail if an external
project included one of them.

Also changed the includes in gdkinteral-quartz.h to local for
faster loading.
---
 gdk/quartz/gdkdisplay-quartz.c  |  1 +
 gdk/quartz/gdkdisplay-quartz.h  |  3 ++-
 gdk/quartz/gdkinternal-quartz.h | 14 +++++++-------
 gdk/quartz/gdkmonitor-quartz.c  |  1 +
 gdk/quartz/gdkmonitor-quartz.h  |  2 +-
 gdk/quartz/gdkscreen-quartz.c   |  2 +-
 gdk/quartz/gdkwindow-quartz.c   |  1 +
 gdk/quartz/gdkwindow-quartz.h   |  1 -
 8 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index 70b3536e07..6186b32925 100644
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -32,6 +32,7 @@
 #include "gdkdisplay-quartz.h"
 #include "gdkmonitor-quartz.h"
 #include "gdkglcontext-quartz.h"
+#include "gdkinternal-quartz.h"
 
 /* Note about coordinates: There are three coordinate systems at play:
  *
diff --git a/gdk/quartz/gdkdisplay-quartz.h b/gdk/quartz/gdkdisplay-quartz.h
index a053ab11cf..66cfe4271e 100644
--- a/gdk/quartz/gdkdisplay-quartz.h
+++ b/gdk/quartz/gdkdisplay-quartz.h
@@ -20,12 +20,13 @@
 #ifndef __GDK_QUARTZ_DISPLAY__
 #define __GDK_QUARTZ_DISPLAY__
 
+#include <AppKit/AppKit.h>
+
 #include "gdkdisplayprivate.h"
 #include "gdkkeys.h"
 #include "gdkwindow.h"
 #include "gdkinternals.h"
 #include "gdkmain.h"
-#include "gdkinternal-quartz.h"
 
 G_BEGIN_DECLS
 
diff --git a/gdk/quartz/gdkinternal-quartz.h b/gdk/quartz/gdkinternal-quartz.h
index ec4a2c1c3b..7f2566ae3f 100644
--- a/gdk/quartz/gdkinternal-quartz.h
+++ b/gdk/quartz/gdkinternal-quartz.h
@@ -42,16 +42,16 @@ typedef float CGFloat;
 #define GDK_QUARTZ_ALLOC_POOL NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]
 #define GDK_QUARTZ_RELEASE_POOL [pool release]
 
-#include <gdk/gdkprivate.h>
-#include <gdk/quartz/gdkquartz.h>
-#include <gdk/quartz/gdkdevicemanager-core-quartz.h>
-#include <gdk/quartz/gdkdnd-quartz.h>
-#include <gdk/quartz/gdkscreen-quartz.h>
-#include <gdk/quartz/gdkwindow-quartz.h>
+#include "../gdkprivate.h"
+#include "gdkquartz.h"
+#include "gdkdevicemanager-core-quartz.h"
+#include "gdkdnd-quartz.h"
+#include "gdkscreen-quartz.h"
+#include "gdkwindow-quartz.h"
 
 #include <gdk/gdk.h>
 
-#include "config.h"
+#include <config.h>
 
 extern GdkDisplay *_gdk_display;
 extern GdkScreen *_gdk_screen;
diff --git a/gdk/quartz/gdkmonitor-quartz.c b/gdk/quartz/gdkmonitor-quartz.c
index 06f1be1dc0..f3f99a583e 100644
--- a/gdk/quartz/gdkmonitor-quartz.c
+++ b/gdk/quartz/gdkmonitor-quartz.c
@@ -22,6 +22,7 @@
 
 #include "gdkmonitor-quartz.h"
 #include "gdkdisplay-quartz.h"
+#include "gdkinternal-quartz.h"
 
 G_DEFINE_TYPE (GdkQuartzMonitor, gdk_quartz_monitor, GDK_TYPE_MONITOR)
 
diff --git a/gdk/quartz/gdkmonitor-quartz.h b/gdk/quartz/gdkmonitor-quartz.h
index d37db8c990..474cd82c94 100644
--- a/gdk/quartz/gdkmonitor-quartz.h
+++ b/gdk/quartz/gdkmonitor-quartz.h
@@ -20,12 +20,12 @@
 
 #include <glib.h>
 #include <gio/gio.h>
+#include <AppKit/AppKit.h>
 
 #include "gdkmonitorprivate.h"
 
 #include "gdkquartzmonitor.h"
 #include "gdkprivate-quartz.h"
-#include "gdkinternal-quartz.h"
 
 struct _GdkQuartzMonitor
 {
diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
index 11f6c15e1c..2b1185df85 100644
--- a/gdk/quartz/gdkscreen-quartz.c
+++ b/gdk/quartz/gdkscreen-quartz.c
@@ -25,7 +25,7 @@
 #include "gdkprivate-quartz.h"
 #include "gdkdisplay-quartz.h"
 #include "gdkmonitor-quartz.h"
- 
+#include "gdkinternal-quartz.h"
 
 /* A couple of notes about this file are in order.  In GDK, a
  * GdkScreen can contain multiple monitors.  A GdkScreen has an
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index cb61aeb2f7..1a3389bb32 100644
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -31,6 +31,7 @@
 #include "gdkquartzscreen.h"
 #include "gdkquartzcursor.h"
 #include "gdkquartz-cocoa-access.h"
+#include "gdkinternal-quartz.h"
 
 #include <Carbon/Carbon.h>
 #include <AvailabilityMacros.h>
diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h
index 3a4384d281..1175f072e4 100644
--- a/gdk/quartz/gdkwindow-quartz.h
+++ b/gdk/quartz/gdkwindow-quartz.h
@@ -22,7 +22,6 @@
 #import <gdk/quartz/GdkQuartzView.h>
 #import <gdk/quartz/GdkQuartzNSWindow.h>
 #include "gdk/gdkwindowimpl.h"
-#include "gdkinternal-quartz.h"
 
 G_BEGIN_DECLS