diff --git a/src/backends/meta-monitor-manager-private.h b/src/backends/meta-monitor-manager-private.h
index e191b50d0..60c1e9082 100644
--- a/src/backends/meta-monitor-manager-private.h
+++ b/src/backends/meta-monitor-manager-private.h
@@ -37,8 +37,6 @@
 #include "meta/display.h"
 #include "meta/meta-monitor-manager.h"
 
-#include "meta-dbus-display-config.h"
-
 #define META_MONITOR_MANAGER_MIN_SCREEN_WIDTH 640
 #define META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT 480
 
@@ -111,6 +109,8 @@ typedef struct _MetaOutputCtm
 #define META_IS_MONITOR_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER))
 #define META_MONITOR_MANAGER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass))
 
+typedef struct _MetaDBusDisplayConfig MetaDBusDisplayConfig;
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (MetaMonitorManager, g_object_unref)
 
 struct _MetaMonitorManager
@@ -197,7 +197,7 @@ struct _MetaMonitorManager
  */
 struct _MetaMonitorManagerClass
 {
-  MetaDBusDisplayConfigSkeletonClass parent_class;
+  GObjectClass parent_class;
 
   GBytes * (* read_edid) (MetaMonitorManager *manager,
                           MetaOutput         *output);
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index d535a83da..a75da9329 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -61,6 +61,8 @@
 #include "meta/main.h"
 #include "meta/meta-x11-errors.h"
 
+#include "meta-dbus-display-config.h"
+
 #define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20
 
 enum