[gnome-flashback] monitor-manager: don't include generated code in header file

[Alberts Muktupāvels <muktupavels src gnome org>]

commit b24a6f02b08768aeba805d9b7899e6f396bf7e70
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Aug 13 13:45:26 2022 +0300

    monitor-manager: don't include generated code in header file
    
    Based on mutter commit:
    https://gitlab.gnome.org/GNOME/mutter/-/commit/91117bb052ed0d69c8ea

 backends/gf-gpu-xrandr.c                       | 1 +
 backends/gf-logical-monitor-config.c           | 1 +
 backends/gf-monitor-config-migration-private.h | 2 ++
 backends/gf-monitor-manager-kms.c              | 2 ++
 backends/gf-monitor-manager-private.h          | 1 -
 backends/gf-monitor-manager-types-private.h    | 2 ++
 backends/gf-monitor-manager.c                  | 1 +
 backends/gf-monitor.c                          | 1 +
 backends/gf-monitors-config.c                  | 3 +++
 9 files changed, 13 insertions(+), 1 deletion(-)
---
diff --git a/backends/gf-gpu-xrandr.c b/backends/gf-gpu-xrandr.c
index 6b5e591..fecbdfb 100644
--- a/backends/gf-gpu-xrandr.c
+++ b/backends/gf-gpu-xrandr.c
@@ -25,6 +25,7 @@
 #include "config.h"
 #include "gf-gpu-xrandr-private.h"
 
+#include <gio/gio.h>
 #include <X11/extensions/dpms.h>
 #include <X11/Xlibint.h>
 
diff --git a/backends/gf-logical-monitor-config.c b/backends/gf-logical-monitor-config.c
index 975c379..bdab28e 100644
--- a/backends/gf-logical-monitor-config.c
+++ b/backends/gf-logical-monitor-config.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <gio/gio.h>
 #include <math.h>
 
 #include "gf-logical-monitor-config-private.h"
diff --git a/backends/gf-monitor-config-migration-private.h b/backends/gf-monitor-config-migration-private.h
index c86602a..635545e 100644
--- a/backends/gf-monitor-config-migration-private.h
+++ b/backends/gf-monitor-config-migration-private.h
@@ -22,6 +22,8 @@
 #ifndef GF_MONITOR_CONFIG_MIGRATION_PRIVATE_H
 #define GF_MONITOR_CONFIG_MIGRATION_PRIVATE_H
 
+#include <gio/gio.h>
+
 #include "gf-monitors-config-private.h"
 
 G_BEGIN_DECLS
diff --git a/backends/gf-monitor-manager-kms.c b/backends/gf-monitor-manager-kms.c
index ca41adb..346a9ea 100644
--- a/backends/gf-monitor-manager-kms.c
+++ b/backends/gf-monitor-manager-kms.c
@@ -26,6 +26,8 @@
 #include "config.h"
 #include "gf-monitor-manager-kms-private.h"
 
+#include <gio/gio.h>
+
 struct _GfMonitorManagerKms
 {
   GfMonitorManager parent;
diff --git a/backends/gf-monitor-manager-private.h b/backends/gf-monitor-manager-private.h
index a05893e..9d84451 100644
--- a/backends/gf-monitor-manager-private.h
+++ b/backends/gf-monitor-manager-private.h
@@ -29,7 +29,6 @@
 #include <libgnome-desktop/gnome-pnp-ids.h>
 
 #include "gf-backend-private.h"
-#include "gf-dbus-display-config.h"
 #include "gf-display-config-shared.h"
 #include "gf-monitor-manager-enums-private.h"
 #include "gf-monitor-manager-types-private.h"
diff --git a/backends/gf-monitor-manager-types-private.h b/backends/gf-monitor-manager-types-private.h
index 15d7678..9840bc6 100644
--- a/backends/gf-monitor-manager-types-private.h
+++ b/backends/gf-monitor-manager-types-private.h
@@ -29,6 +29,8 @@
 
 G_BEGIN_DECLS
 
+typedef struct _GfDBusDisplayConfig GfDBusDisplayConfig;
+
 typedef struct _GfMonitorConfigManager GfMonitorConfigManager;
 typedef struct _GfMonitorConfigStore GfMonitorConfigStore;
 typedef struct _GfMonitorsConfig GfMonitorsConfig;
diff --git a/backends/gf-monitor-manager.c b/backends/gf-monitor-manager.c
index 5a54095..d2d16d2 100644
--- a/backends/gf-monitor-manager.c
+++ b/backends/gf-monitor-manager.c
@@ -32,6 +32,7 @@
 #include <string.h>
 
 #include "gf-crtc-private.h"
+#include "gf-dbus-display-config.h"
 #include "gf-logical-monitor-private.h"
 #include "gf-monitor-config-manager-private.h"
 #include "gf-monitor-config-store-private.h"
diff --git a/backends/gf-monitor.c b/backends/gf-monitor.c
index a8dcfbc..deae884 100644
--- a/backends/gf-monitor.c
+++ b/backends/gf-monitor.c
@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 #include <math.h>
 #include <string.h>
diff --git a/backends/gf-monitors-config.c b/backends/gf-monitors-config.c
index aac41d6..92b1ba5 100644
--- a/backends/gf-monitors-config.c
+++ b/backends/gf-monitors-config.c
@@ -20,6 +20,9 @@
  */
 
 #include "config.h"
+
+#include <gio/gio.h>
+
 #include "gf-logical-monitor-config-private.h"
 #include "gf-monitor-config-private.h"
 #include "gf-monitor-spec-private.h"