From a38f9c2d487484ad7526242f009789ad8feed930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 12 Dec 2024 22:28:56 +0100
Subject: [PATCH] gpu: Don't include monitor manager header

Doing so pulls in too much, causing potential header include order
conflicts.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4192>
---
 src/backends/meta-color-device.c  | 1 +
 src/backends/meta-color-manager.c | 1 +
 src/backends/meta-crtc.c          | 1 +
 src/backends/meta-gpu.h           | 2 +-
 src/backends/meta-output.c        | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/backends/meta-color-device.c b/src/backends/meta-color-device.c
index 49f70dcf2..04a130e69 100644
--- a/src/backends/meta-color-device.c
+++ b/src/backends/meta-color-device.c
@@ -24,6 +24,7 @@
 
 #include <colord.h>
 
+#include "backends/meta-backend-private.h"
 #include "backends/meta-color-device.h"
 #include "backends/meta-color-manager-private.h"
 #include "backends/meta-color-profile.h"
diff --git a/src/backends/meta-color-manager.c b/src/backends/meta-color-manager.c
index 7a583789b..179e2a750 100644
--- a/src/backends/meta-color-manager.c
+++ b/src/backends/meta-color-manager.c
@@ -50,6 +50,7 @@
 #include "backends/meta-backend-types.h"
 #include "backends/meta-color-device.h"
 #include "backends/meta-color-store.h"
+#include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-monitor.h"
 
 #include "meta-dbus-gsd-color.h"
diff --git a/src/backends/meta-crtc.c b/src/backends/meta-crtc.c
index 5fb222344..2d8d2b64a 100644
--- a/src/backends/meta-crtc.c
+++ b/src/backends/meta-crtc.c
@@ -20,6 +20,7 @@
 #include "backends/meta-crtc.h"
 
 #include "backends/meta-gpu.h"
+#include "meta/meta-backend.h"
 
 enum
 {
diff --git a/src/backends/meta-gpu.h b/src/backends/meta-gpu.h
index 25def53f7..0bf9e3053 100644
--- a/src/backends/meta-gpu.h
+++ b/src/backends/meta-gpu.h
@@ -21,7 +21,7 @@
 
 #include <glib-object.h>
 
-#include "backends/meta-monitor-manager-private.h"
+#include "core/util-private.h"
 
 #define META_TYPE_GPU (meta_gpu_get_type ())
 META_EXPORT_TEST
diff --git a/src/backends/meta-output.c b/src/backends/meta-output.c
index 090fee68c..937aa8bb6 100644
--- a/src/backends/meta-output.c
+++ b/src/backends/meta-output.c
@@ -21,6 +21,7 @@
 
 #include "backends/edid.h"
 #include "backends/meta-crtc.h"
+#include "backends/meta-monitor-manager-private.h"
 
 enum
 {