Clean up include macros mess

The order and way include macros were structured was chaotic, with no
real common thread between files. Try to tidy up the mess with some
common scheme, to make things look less messy.

src/Makefile.am

@@ -20,10 +20,6 @@ AM_CPPFLAGS = \
 	$(MUTTER_NATIVE_BACKEND_CFLAGS)					\
 	-I$(builddir)							\
 	-I$(srcdir)							\
-	-I$(srcdir)/backends						\
-	-I$(srcdir)/core						\
-	-I$(srcdir)/ui							\
-	-I$(srcdir)/compositor						\
 	-I$(top_srcdir)/cogl						\
 	-I$(top_srcdir)/cogl/cogl					\
 	-I$(top_srcdir)/cogl/cogl/winsys				\

src/backends/edid-parse.c

@@ -22,12 +22,15 @@
 
 /* Author: Soren Sandmann <sandmann@redhat.com> */
 
-#include "edid.h"
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <glib.h>
 
+#include "backends/edid.h"
+
 static int
 get_bit (int in, int bit)
 {

src/backends/meta-backend-private.h

@@ -27,24 +27,25 @@
 #define META_BACKEND_PRIVATE_H
 
 #include <glib-object.h>
-
 #include <xkbcommon/xkbcommon.h>
 
-#include <meta/meta-backend.h>
-#include <meta/meta-idle-monitor.h>
-#include "meta-cursor-renderer.h"
-#include "meta-monitor-manager-private.h"
-#include "meta-orientation-manager.h"
-#include "meta-input-settings-private.h"
+#include "meta/meta-backend.h"
+#include "meta/meta-idle-monitor.h"
+#include "backends/meta-backend-types.h"
+#include "backends/meta-cursor-renderer.h"
 #include "backends/meta-egl.h"
+#include "backends/meta-input-settings-private.h"
+#include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-orientation-manager.h"
 #include "backends/meta-pointer-constraint.h"
-#ifdef HAVE_REMOTE_DESKTOP
-#include "backends/meta-remote-desktop.h"
-#endif
 #include "backends/meta-renderer.h"
 #include "backends/meta-settings-private.h"
 #include "core/util-private.h"
 
+#ifdef HAVE_REMOTE_DESKTOP
+#include "backends/meta-remote-desktop.h"
+#endif
+
 #define DEFAULT_XKB_RULES_FILE "evdev"
 #define DEFAULT_XKB_MODEL "pc105+inet"
 

src/backends/meta-backend-types.h

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2003 Rob Adams
+ * Copyright (C) 2004-2006 Elijah Newren
+ * Copyright (C) 2013-2018 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef META_BACKEND_TYPE_H
+#define META_BACKEND_TYPE_H
+
+typedef struct _MetaMonitorManager MetaMonitorManager;
+
+typedef struct _MetaMonitorConfigManager MetaMonitorConfigManager;
+typedef struct _MetaMonitorConfigStore MetaMonitorConfigStore;
+typedef struct _MetaMonitorsConfig MetaMonitorsConfig;
+
+typedef struct _MetaMonitor MetaMonitor;
+typedef struct _MetaMonitorNormal MetaMonitorNormal;
+typedef struct _MetaMonitorTiled MetaMonitorTiled;
+typedef struct _MetaMonitorSpec MetaMonitorSpec;
+typedef struct _MetaLogicalMonitor MetaLogicalMonitor;
+
+typedef enum _MetaMonitorTransform
+{
+  META_MONITOR_TRANSFORM_NORMAL,
+  META_MONITOR_TRANSFORM_90,
+  META_MONITOR_TRANSFORM_180,
+  META_MONITOR_TRANSFORM_270,
+  META_MONITOR_TRANSFORM_FLIPPED,
+  META_MONITOR_TRANSFORM_FLIPPED_90,
+  META_MONITOR_TRANSFORM_FLIPPED_180,
+  META_MONITOR_TRANSFORM_FLIPPED_270,
+} MetaMonitorTransform;
+
+typedef struct _MetaMonitorMode MetaMonitorMode;
+
+typedef struct _MetaGpu MetaGpu;
+
+typedef struct _MetaCrtc MetaCrtc;
+typedef struct _MetaOutput MetaOutput;
+typedef struct _MetaCrtcMode MetaCrtcMode;
+typedef struct _MetaCrtcInfo MetaCrtcInfo;
+typedef struct _MetaOutputInfo MetaOutputInfo;
+typedef struct _MetaTileInfo MetaTileInfo;
+
+typedef struct _MetaRenderer MetaRenderer;
+typedef struct _MetaRendererView MetaRendererView;
+
+#endif /* META_BACKEND_TYPE_H */

src/backends/meta-backend.c

@@ -24,34 +24,34 @@
 
 #include "config.h"
 
+#include "backends/meta-backend-private.h"
+
 #include <stdlib.h>
 
-#include <clutter/clutter-mutter.h>
-#include <meta/meta-backend.h>
-#include <meta/main.h>
-#include <meta/util.h>
-#include "meta-backend-private.h"
-#include "meta-input-settings-private.h"
+#include "backends/meta-cursor-tracker-private.h"
+#include "backends/meta-idle-monitor-private.h"
+#include "backends/meta-input-settings-private.h"
+#include "backends/meta-logical-monitor.h"
+#include "backends/meta-monitor-manager-dummy.h"
+#include "backends/meta-settings-private.h"
+#include "backends/meta-stage-private.h"
 #include "backends/x11/meta-backend-x11.h"
-#include "meta-cursor-tracker-private.h"
-#include "meta-stage-private.h"
+#include "clutter/clutter-mutter.h"
+#include "meta/main.h"
+#include "meta/meta-backend.h"
+#include "meta/util.h"
 
 #ifdef HAVE_REMOTE_DESKTOP
 #include "backends/meta-dbus-session-watcher.h"
-#include "backends/meta-screen-cast.h"
 #include "backends/meta-remote-access-controller-private.h"
 #include "backends/meta-remote-desktop.h"
+#include "backends/meta-screen-cast.h"
 #endif
 
 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-backend-native.h"
 #endif
 
-#include "backends/meta-idle-monitor-private.h"
-#include "backends/meta-logical-monitor.h"
-#include "backends/meta-monitor-manager-dummy.h"
-#include "backends/meta-settings-private.h"
-
 #define META_IDLE_MONITOR_CORE_DEVICE 0
 
 enum

src/backends/meta-barrier-private.h

@@ -27,6 +27,7 @@
 #define META_BARRIER_PRIVATE_H
 
 #include "core/meta-border.h"
+#include "meta/barrier.h"
 
 G_BEGIN_DECLS
 

src/backends/meta-barrier.c

@@ -8,15 +8,20 @@
 
 #include "config.h"
 
+#include "meta/barrier.h"
+#include "backends/meta-barrier-private.h"
+
 #include <glib-object.h>
 
-#include <meta/util.h>
-#include <meta/barrier.h>
-#include "backends/native/meta-backend-native.h"
-#include "backends/native/meta-barrier-native.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "backends/x11/meta-barrier-x11.h"
-#include <meta/meta-enum-types.h>
+#include "meta/meta-enum-types.h"
+#include "meta/util.h"
+
+#ifdef HAVE_NATIVE_BACKEND
+#include "backends/native/meta-backend-native.h"
+#include "backends/native/meta-barrier-native.h"
+#endif
 
 G_DEFINE_TYPE_WITH_PRIVATE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
 G_DEFINE_TYPE (MetaBarrierImpl, meta_barrier_impl, G_TYPE_OBJECT)

src/backends/meta-crtc.h

@@ -22,7 +22,8 @@
 
 #include <glib-object.h>
 
-#include "backends/meta-gpu.h"
+#include "backends/meta-backend-types.h"
+#include "meta/boxes.h"
 
 /* Same as KMS mode flags and X11 randr flags */
 typedef enum _MetaCrtcModeFlag

src/backends/meta-cursor-renderer.c

@@ -24,16 +24,15 @@
 
 #include "config.h"
 
-#include "meta-cursor-renderer.h"
+#include "backends/meta-cursor-renderer.h"
 
-#include <meta/meta-backend.h>
-#include <meta/util.h>
 #include <math.h>
 
-#include <cogl/cogl.h>
-#include <clutter/clutter.h>
-
-#include "meta-stage-private.h"
+#include "backends/meta-stage-private.h"
+#include "clutter/clutter.h"
+#include "cogl/cogl.h"
+#include "meta/meta-backend.h"
+#include "meta/util.h"
 
 struct _MetaCursorRendererPrivate
 {

src/backends/meta-cursor-renderer.h

@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 
-#include "meta-cursor.h"
+#include "backends/meta-cursor.h"
 
 #define META_TYPE_CURSOR_RENDERER (meta_cursor_renderer_get_type ())
 G_DECLARE_DERIVABLE_TYPE (MetaCursorRenderer, meta_cursor_renderer,

src/backends/meta-cursor-tracker-private.h

@@ -22,11 +22,10 @@
 #ifndef META_CURSOR_TRACKER_PRIVATE_H
 #define META_CURSOR_TRACKER_PRIVATE_H
 
-#include <meta/meta-cursor-tracker.h>
-
-#include "meta-cursor.h"
-#include "meta-cursor-renderer.h"
+#include "backends/meta-cursor.h"
+#include "backends/meta-cursor-renderer.h"
 #include "backends/x11/cm/meta-cursor-sprite-xfixes.h"
+#include "meta/meta-cursor-tracker.h"
 
 struct _MetaCursorTracker {
   GObject parent_instance;

src/backends/meta-cursor-tracker.c

@@ -28,21 +28,20 @@
  */
 
 #include "config.h"
-#include "meta-cursor-tracker-private.h"
 
-#include <string.h>
-#include <meta/main.h>
-#include <meta/util.h>
-#include <meta/meta-x11-errors.h>
-
-#include <cogl/cogl.h>
-#include <clutter/clutter.h>
+#include "backends/meta-cursor-tracker-private.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
+#include <string.h>
 
-#include "meta-backend-private.h"
+#include "backends/meta-backend-private.h"
 #include "backends/x11/cm/meta-cursor-sprite-xfixes.h"
+#include "cogl/cogl.h"
+#include "clutter/clutter.h"
+#include "meta/main.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/util.h"
 #include "x11/meta-x11-display-private.h"
 
 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);

src/backends/meta-cursor.c

@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "meta-cursor.h"
+#include "backends/meta-cursor.h"
 
 #include "backends/meta-backend-private.h"
 #include "cogl/cogl.h"

src/backends/meta-cursor.h

@@ -22,8 +22,8 @@
 #ifndef META_CURSOR_H
 #define META_CURSOR_H
 
-#include <meta/common.h>
-#include <meta/boxes.h>
+#include "meta/common.h"
+#include "meta/boxes.h"
 
 #define META_TYPE_CURSOR_SPRITE (meta_cursor_sprite_get_type ())
 G_DECLARE_DERIVABLE_TYPE (MetaCursorSprite,

src/backends/meta-dnd-private.h

@@ -20,8 +20,11 @@
 #ifndef META_DND_PRIVATE__H
 #define META_DND_PRIVATE__H
 
+#include <glib.h>
 #include <X11/Xlib.h>
 
+#include "backends/meta-backend-private.h"
+
 gboolean meta_dnd_handle_xdnd_event (MetaBackend    *backend,
                                      MetaCompositor *compositor,
                                      Display        *xdisplay,

src/backends/meta-egl.c

@@ -24,17 +24,17 @@
 
 #include "config.h"
 
-#include "backends/meta-backend-private.h"
-#include "backends/meta-egl.h"
-#include "backends/meta-egl-ext.h"
-#include "meta/util.h"
-
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <gio/gio.h>
 #include <glib.h>
 #include <glib-object.h>
 
+#include "backends/meta-backend-private.h"
+#include "backends/meta-egl.h"
+#include "backends/meta-egl-ext.h"
+#include "meta/util.h"
+
 struct _MetaEgl
 {
   GObject parent;

src/backends/meta-idle-monitor-dbus.c

@@ -22,14 +22,15 @@
 
 #include "config.h"
 
-#include "meta-idle-monitor-dbus.h"
-#include <meta/meta-idle-monitor.h>
-#include <backends/meta-idle-monitor-private.h>
-#include "meta-dbus-idle-monitor.h"
+#include "backends/meta-idle-monitor-dbus.h"
 
-#include <clutter/clutter.h>
-#include <meta/util.h>
-#include <meta/main.h> /* for meta_get_replace_current_wm () */
+#include "backends/meta-idle-monitor-private.h"
+#include "clutter/clutter.h"
+#include "meta/main.h"
+#include "meta/meta-idle-monitor.h"
+#include "meta/util.h"
+
+#include "meta-dbus-idle-monitor.h"
 
 static gboolean
 handle_get_idletime (MetaDBusIdleMonitor   *skeleton,

src/backends/meta-idle-monitor-private.h

@@ -23,8 +23,8 @@
 #ifndef META_IDLE_MONITOR_PRIVATE_H
 #define META_IDLE_MONITOR_PRIVATE_H
 
-#include <meta/meta-idle-monitor.h>
-#include "display-private.h"
+#include "core/display-private.h"
+#include "meta/meta-idle-monitor.h"
 
 typedef struct
 {

src/backends/meta-idle-monitor.c

@@ -29,17 +29,17 @@
 #include "config.h"
 
 #include <string.h>
-#include <clutter/clutter.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/sync.h>
 
-#include <meta/util.h>
-#include <meta/main.h>
-#include <meta/meta-idle-monitor.h>
-#include "gsm-inhibitor-flag.h"
-#include "meta-idle-monitor-private.h"
-#include "meta-idle-monitor-dbus.h"
-#include "meta-backend-private.h"
+#include "backends/gsm-inhibitor-flag.h"
+#include "backends/meta-backend-private.h"
+#include "backends/meta-idle-monitor-private.h"
+#include "backends/meta-idle-monitor-dbus.h"
+#include "clutter/clutter.h"
+#include "meta/main.h"
+#include "meta/meta-idle-monitor.h"
+#include "meta/util.h"
 
 G_STATIC_ASSERT(sizeof(unsigned long) == sizeof(gpointer));
 

src/backends/meta-input-settings-private.h

@@ -22,15 +22,16 @@
 #ifndef META_INPUT_SETTINGS_PRIVATE_H
 #define META_INPUT_SETTINGS_PRIVATE_H
 
-#include "display-private.h"
-#include "meta-monitor-manager-private.h"
-
-#include <clutter/clutter.h>
+#include <gsettings-desktop-schemas/gdesktop-enums.h>
 
 #ifdef HAVE_LIBWACOM
 #include <libwacom/libwacom.h>
 #endif
 
+#include "backends/meta-backend-types.h"
+#include "clutter/clutter.h"
+#include "meta/display.h"
+
 #define META_TYPE_INPUT_SETTINGS (meta_input_settings_get_type ())
 G_DECLARE_DERIVABLE_TYPE (MetaInputSettings, meta_input_settings,
                           META, INPUT_SETTINGS, GObject)

src/backends/meta-input-settings.c

@@ -27,15 +27,15 @@
 
 #include "config.h"
 
+#include <glib/gi18n-lib.h>
 #include <string.h>
 
-#include "meta-backend-private.h"
-#include "meta-input-settings-private.h"
+#include "backends/meta-backend-private.h"
+#include "backends/meta-input-settings-private.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor.h"
-
-#include <glib/gi18n-lib.h>
-#include <meta/util.h>
+#include "core/display-private.h"
+#include "meta/util.h"
 
 static GQuark quark_tool_settings = 0;
 

src/backends/meta-monitor-manager-dummy.c

@@ -25,16 +25,16 @@
 
 #include "config.h"
 
-#include "meta-monitor-manager-dummy.h"
+#include "backends/meta-monitor-manager-dummy.h"
 
 #include <stdlib.h>
 
-#include <meta/util.h>
 #include "backends/meta-backend-private.h"
 #include "backends/meta-crtc.h"
 #include "backends/meta-monitor.h"
 #include "backends/meta-monitor-config-manager.h"
 #include "backends/meta-output.h"
+#include "meta/util.h"
 
 #define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
 

src/backends/meta-monitor-manager-dummy.h

@@ -23,8 +23,8 @@
 #ifndef META_MONITOR_MANAGER_DUMMY_H
 #define META_MONITOR_MANAGER_DUMMY_H
 
-#include "meta-monitor-manager-private.h"
 #include "backends/meta-gpu.h"
+#include "backends/meta-monitor-manager-private.h"
 
 #define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ())
 G_DECLARE_FINAL_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy,

src/backends/meta-monitor-manager-private.h

@@ -38,34 +38,13 @@
 #include <cogl/cogl.h>
 #include <libgnome-desktop/gnome-pnp-ids.h>
 
-#include "display-private.h"
-#include "stack-tracker.h"
-#include <meta/meta-monitor-manager.h>
+#include "backends/meta-backend-private.h"
+#include "backends/meta-cursor.h"
+#include "backends/meta-display-config-shared.h"
+#include "meta/display.h"
+#include "meta/meta-monitor-manager.h"
 
-#include "meta-display-config-shared.h"
 #include "meta-dbus-display-config.h"
-#include "meta-cursor.h"
-
-typedef struct _MetaMonitorConfigManager MetaMonitorConfigManager;
-typedef struct _MetaMonitorConfigStore MetaMonitorConfigStore;
-typedef struct _MetaMonitorsConfig MetaMonitorsConfig;
-
-typedef struct _MetaMonitor MetaMonitor;
-typedef struct _MetaMonitorNormal MetaMonitorNormal;
-typedef struct _MetaMonitorTiled MetaMonitorTiled;
-typedef struct _MetaMonitorSpec MetaMonitorSpec;
-typedef struct _MetaLogicalMonitor MetaLogicalMonitor;
-
-typedef struct _MetaMonitorMode MetaMonitorMode;
-
-typedef struct _MetaGpu MetaGpu;
-
-typedef struct _MetaCrtc MetaCrtc;
-typedef struct _MetaOutput MetaOutput;
-typedef struct _MetaCrtcMode MetaCrtcMode;
-typedef struct _MetaCrtcInfo MetaCrtcInfo;
-typedef struct _MetaOutputInfo MetaOutputInfo;
-typedef struct _MetaTileInfo MetaTileInfo;
 
 #define META_MONITOR_MANAGER_MIN_SCREEN_WIDTH 640
 #define META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT 480
@@ -93,18 +72,6 @@ typedef enum _MetaLogicalMonitorLayoutMode
   META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL = 2
 } MetaLogicalMonitorLayoutMode;
 
-typedef enum
-{
-  META_MONITOR_TRANSFORM_NORMAL,
-  META_MONITOR_TRANSFORM_90,
-  META_MONITOR_TRANSFORM_180,
-  META_MONITOR_TRANSFORM_270,
-  META_MONITOR_TRANSFORM_FLIPPED,
-  META_MONITOR_TRANSFORM_FLIPPED_90,
-  META_MONITOR_TRANSFORM_FLIPPED_180,
-  META_MONITOR_TRANSFORM_FLIPPED_270,
-} MetaMonitorTransform;
-
 /*
  * MetaCrtcInfo:
  *

src/backends/meta-monitor-manager.c

@@ -25,17 +25,13 @@
 
 #include "config.h"
 
-#include "meta-monitor-manager-private.h"
+#include "backends/meta-monitor-manager-private.h"
 
 #include <string.h>
 #include <math.h>
 #include <stdlib.h>
-#include <clutter/clutter.h>
 
-#include <meta/main.h>
-#include "util-private.h"
-#include <meta/meta-x11-errors.h>
-#include "edid.h"
+#include "backends/edid.h"
 #include "backends/meta-backend-private.h"
 #include "backends/meta-crtc.h"
 #include "backends/meta-logical-monitor.h"
@@ -44,7 +40,10 @@
 #include "backends/meta-orientation-manager.h"
 #include "backends/meta-output.h"
 #include "backends/x11/meta-monitor-manager-xrandr.h"
-#include "meta-backend-private.h"
+#include "clutter/clutter.h"
+#include "core/util-private.h"
+#include "meta/main.h"
+#include "meta/meta-x11-errors.h"
 
 #define DEFAULT_DISPLAY_CONFIGURATION_TIMEOUT 20
 

src/backends/meta-monitor.h

@@ -24,8 +24,8 @@
 
 #include <glib-object.h>
 
+#include "backends/meta-backend-types.h"
 #include "backends/meta-crtc.h"
-#include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-output.h"
 
 typedef struct _MetaMonitorSpec

src/backends/meta-orientation-manager.c

@@ -21,10 +21,10 @@
 
 #include "config.h"
 
-#include <gio/gio.h>
-
 #include "backends/meta-orientation-manager.h"
 
+#include <gio/gio.h>
+
 enum
 {
   ORIENTATION_CHANGED,

src/backends/meta-orientation-manager.h

@@ -22,6 +22,8 @@
 #ifndef META_ORIENTATION_MANAGER_H
 #define META_ORIENTATION_MANAGER_H
 
+#include <glib-object.h>
+
 typedef enum
 {
   META_ORIENTATION_UNDEFINED,

src/backends/meta-output.h

@@ -22,6 +22,7 @@
 
 #include <glib-object.h>
 
+#include "backends/meta-backend-types.h"
 #include "backends/meta-gpu.h"
 
 struct _MetaTileInfo

src/backends/meta-pointer-constraint.h

@@ -26,7 +26,8 @@
 #define META_POINTER_CONSTRAINT_H
 
 #include <glib-object.h>
-#include <clutter/clutter.h>
+
+#include "clutter/clutter.h"
 
 G_BEGIN_DECLS
 

src/backends/meta-remote-desktop-session.c

@@ -35,6 +35,7 @@
 #include "backends/x11/meta-backend-x11.h"
 #include "cogl/cogl.h"
 #include "meta/meta-backend.h"
+
 #include "meta-dbus-remote-desktop.h"
 
 #define META_REMOTE_DESKTOP_SESSION_DBUS_PATH "/org/gnome/Mutter/RemoteDesktop/Session"

src/backends/meta-remote-desktop.c

@@ -32,13 +32,14 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "meta-dbus-remote-desktop.h"
 #include "backends/meta-backend-private.h"
 #include "backends/meta-cursor-renderer.h"
 #include "backends/meta-remote-desktop-session.h"
 #include "backends/native/meta-cursor-renderer-native.h"
 #include "meta/meta-backend.h"
 
+#include "meta-dbus-remote-desktop.h"
+
 #define META_REMOTE_DESKTOP_DBUS_SERVICE "org.gnome.Mutter.RemoteDesktop"
 #define META_REMOTE_DESKTOP_DBUS_PATH "/org/gnome/Mutter/RemoteDesktop"
 #define META_REMOTE_DESKTOP_API_VERSION 1

src/backends/meta-remote-desktop.h

@@ -26,6 +26,7 @@
 #include <glib-object.h>
 
 #include "backends/meta-dbus-session-watcher.h"
+
 #include "meta-dbus-remote-desktop.h"
 
 typedef struct _MetaRemoteDesktopSession MetaRemoteDesktopSession;

src/backends/meta-renderer.c

@@ -24,10 +24,11 @@
 
 #include "config.h"
 
+#include "backends/meta-renderer.h"
+
 #include <glib-object.h>
 
 #include "backends/meta-backend-private.h"
-#include "backends/meta-renderer.h"
 
 typedef struct _MetaRendererPrivate
 {

src/backends/meta-renderer.h

@@ -27,10 +27,10 @@
 
 #include <glib-object.h>
 
-#include "cogl/cogl.h"
-#include "clutter/clutter-mutter.h"
 #include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-renderer-view.h"
+#include "clutter/clutter-mutter.h"
+#include "cogl/cogl.h"
 
 #define META_TYPE_RENDERER (meta_renderer_get_type ())
 G_DECLARE_DERIVABLE_TYPE (MetaRenderer, meta_renderer, META, RENDERER, GObject)

src/backends/meta-screen-cast-monitor-stream-src.c

@@ -25,9 +25,9 @@
 #include "backends/meta-screen-cast-monitor-stream-src.h"
 
 #include "backends/meta-backend-private.h"
-#include "backends/meta-screen-cast-monitor-stream.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor.h"
+#include "backends/meta-screen-cast-monitor-stream.h"
 #include "clutter/clutter.h"
 #include "clutter/clutter-mutter.h"
 

src/backends/meta-screen-cast.c

@@ -27,8 +27,8 @@
 #include <pipewire/pipewire.h>
 
 #include "backends/meta-backend-private.h"
-#include "backends/meta-screen-cast-session.h"
 #include "backends/meta-remote-desktop-session.h"
+#include "backends/meta-screen-cast-session.h"
 
 #define META_SCREEN_CAST_DBUS_SERVICE "org.gnome.Mutter.ScreenCast"
 #define META_SCREEN_CAST_DBUS_PATH "/org/gnome/Mutter/ScreenCast"

src/backends/meta-screen-cast.h

@@ -26,6 +26,7 @@
 #include <glib-object.h>
 
 #include "backends/meta-dbus-session-watcher.h"
+
 #include "meta-dbus-screen-cast.h"
 
 #define META_TYPE_SCREEN_CAST (meta_screen_cast_get_type ())

src/backends/meta-stage-private.h

@@ -20,10 +20,9 @@
 #ifndef META_STAGE_PRIVATE_H
 #define META_STAGE_PRIVATE_H
 
-#include <meta/meta-stage.h>
-
-#include "meta-cursor.h"
-#include <meta/boxes.h>
+#include "backends/meta-cursor.h"
+#include "meta/boxes.h"
+#include "meta/meta-stage.h"
 
 G_BEGIN_DECLS
 

src/backends/meta-stage.c

@@ -20,15 +20,15 @@
  *     Jasper St. Pierre <jstpierre@mecheye.net>
  */
 
-#include <config.h>
+#include "config.h"
 
-#include "meta-stage-private.h"
+#include "backends/meta-stage-private.h"
 
-#include <meta/meta-backend.h>
-#include <meta/meta-monitor-manager.h>
-#include <meta/util.h>
 #include "backends/meta-backend-private.h"
 #include "clutter/clutter-mutter.h"
+#include "meta/meta-backend.h"
+#include "meta/meta-monitor-manager.h"
+#include "meta/util.h"
 
 struct _MetaOverlay {
   gboolean enabled;

src/backends/native/dbus-utils.c

@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include "dbus-utils.h"
+#include "backends/native/dbus-utils.h"
 
 #include <glib.h>
 

src/backends/native/meta-backend-native.c

@@ -24,31 +24,30 @@
 
 #include "config.h"
 
-#include "meta-backend-native.h"
-#include "meta-backend-native-private.h"
+#include "backends/native/meta-backend-native.h"
+#include "backends/native/meta-backend-native-private.h"
 
-#include <meta/main.h>
-#include <clutter/evdev/clutter-evdev.h>
+#include <stdlib.h>
 
-#include "clutter/egl/clutter-egl.h"
-#include "clutter/evdev/clutter-evdev.h"
-#include "meta-barrier-native.h"
-#include "meta-border.h"
-#include "meta-monitor-manager-kms.h"
-#include "meta-cursor-renderer-native.h"
-#include "meta-launcher.h"
 #include "backends/meta-cursor-tracker-private.h"
 #include "backends/meta-idle-monitor-private.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-pointer-constraint.h"
 #include "backends/meta-stage-private.h"
+#include "backends/native/meta-barrier-native.h"
 #include "backends/native/meta-clutter-backend-native.h"
+#include "backends/native/meta-cursor-renderer-native.h"
 #include "backends/native/meta-input-settings-native.h"
+#include "backends/native/meta-launcher.h"
+#include "backends/native/meta-monitor-manager-kms.h"
 #include "backends/native/meta-renderer-native.h"
 #include "backends/native/meta-stage-native.h"
-
-#include <stdlib.h>
+#include "clutter/evdev/clutter-evdev.h"
+#include "clutter/egl/clutter-egl.h"
+#include "clutter/evdev/clutter-evdev.h"
+#include "core/meta-border.h"
+#include "meta/main.h"
 
 struct _MetaBackendNative
 {

src/backends/native/meta-barrier-native.c

@@ -30,15 +30,16 @@
 
 #include "config.h"
 
+#include "backends/native/meta-barrier-native.h"
+
 #include <stdlib.h>
 
-#include <meta/barrier.h>
-#include <meta/util.h>
 #include "backends/meta-backend-private.h"
 #include "backends/meta-barrier-private.h"
 #include "backends/native/meta-backend-native.h"
 #include "backends/native/meta-backend-native-private.h"
-#include "backends/native/meta-barrier-native.h"
+#include "meta/barrier.h"
+#include "meta/util.h"
 
 struct _MetaBarrierManagerNative
 {

src/backends/native/meta-clutter-backend-native.c

@@ -24,15 +24,16 @@
 
 #include "config.h"
 
+#include "backends/native/meta-clutter-backend-native.h"
+
 #include <glib-object.h>
 
 #include "backends/meta-backend-private.h"
 #include "backends/meta-renderer.h"
-#include "backends/native/meta-clutter-backend-native.h"
 #include "backends/native/meta-stage-native.h"
 #include "clutter/clutter.h"
-#include "meta/meta-backend.h"
 #include "core/bell.h"
+#include "meta/meta-backend.h"
 
 struct _MetaClutterBackendNative
 {

src/backends/native/meta-clutter-backend-native.h

@@ -27,9 +27,9 @@
 
 #include <glib-object.h>
 
+#include "backends/native/meta-stage-native.h"
 #include "clutter/clutter.h"
 #include "clutter/egl/clutter-backend-eglnative.h"
-#include "backends/native/meta-stage-native.h"
 
 #define META_TYPE_CLUTTER_BACKEND_NATIVE (meta_clutter_backend_native_get_type ())
 G_DECLARE_FINAL_TYPE (MetaClutterBackendNative, meta_clutter_backend_native,

src/backends/native/meta-crtc-kms.c

@@ -29,8 +29,6 @@
 #include "backends/meta-backend-private.h"
 #include "backends/native/meta-gpu-kms.h"
 
-#include <drm_fourcc.h>
-
 #define ALL_TRANSFORMS (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)
 #define ALL_TRANSFORMS_MASK ((1 << ALL_TRANSFORMS) - 1)
 

src/backends/native/meta-crtc-kms.h

@@ -25,8 +25,8 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
+#include "backends/meta-backend-types.h"
 #include "backends/meta-crtc.h"
-#include "backends/meta-gpu.h"
 #include "backends/native/meta-gpu-kms.h"
 
 gboolean meta_crtc_kms_is_transform_handled (MetaCrtc             *crtc,

src/backends/native/meta-cursor-renderer-native.c

@@ -24,16 +24,13 @@
 
 #include "config.h"
 
-#include "meta-cursor-renderer-native.h"
+#include "backends/native/meta-cursor-renderer-native.h"
 
 #include <string.h>
 #include <gbm.h>
 #include <xf86drm.h>
 #include <errno.h>
 
-#include <meta/util.h>
-#include <meta/meta-backend.h>
-
 #include "backends/meta-backend-private.h"
 #include "backends/meta-cursor-sprite-xcursor.h"
 #include "backends/meta-logical-monitor.h"
@@ -43,6 +40,8 @@
 #include "backends/native/meta-renderer-native.h"
 #include "core/boxes-private.h"
 #include "meta/boxes.h"
+#include "meta/meta-backend.h"
+#include "meta/util.h"
 
 #ifdef HAVE_WAYLAND
 #include "wayland/meta-cursor-sprite-wayland.h"

src/backends/native/meta-cursor-renderer-native.h

@@ -25,7 +25,7 @@
 #ifndef META_CURSOR_RENDERER_NATIVE_H
 #define META_CURSOR_RENDERER_NATIVE_H
 
-#include "meta-cursor-renderer.h"
+#include "backends/meta-cursor-renderer.h"
 #include "meta/meta-backend.h"
 
 #define META_TYPE_CURSOR_RENDERER_NATIVE (meta_cursor_renderer_native_get_type ())

src/backends/native/meta-input-settings-native.c

@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <clutter/evdev/clutter-evdev.h>
 #include <linux/input-event-codes.h>
 #include <libinput.h>
 
-#include "meta-backend-native.h"
-#include "meta-input-settings-native.h"
 #include "backends/meta-logical-monitor.h"
+#include "backends/native/meta-backend-native.h"
+#include "backends/native/meta-input-settings-native.h"
+#include "clutter/evdev/clutter-evdev.h"
 
 G_DEFINE_TYPE (MetaInputSettingsNative, meta_input_settings_native, META_TYPE_INPUT_SETTINGS)
 

src/backends/native/meta-input-settings-native.h

@@ -22,7 +22,7 @@
 #ifndef META_INPUT_SETTINGS_NATIVE_H
 #define META_INPUT_SETTINGS_NATIVE_H
 
-#include "meta-input-settings-private.h"
+#include "backends/meta-input-settings-private.h"
 
 #define META_TYPE_INPUT_SETTINGS_NATIVE             (meta_input_settings_native_get_type ())
 #define META_INPUT_SETTINGS_NATIVE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_INPUT_SETTINGS_NATIVE, MetaInputSettingsNative))

src/backends/native/meta-launcher.c

@@ -19,13 +19,9 @@
 
 #include "config.h"
 
-#include "meta-launcher.h"
+#include "backends/native/meta-launcher.h"
 
 #include <gio/gunixfdlist.h>
-
-#include <clutter/clutter.h>
-#include <clutter/evdev/clutter-evdev.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <malloc.h>
@@ -34,17 +30,18 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-
 #include <systemd/sd-login.h>
 #include <gudev/gudev.h>
 
-#include "dbus-utils.h"
-#include "meta-dbus-login1.h"
-
 #include "backends/meta-backend-private.h"
+#include "backends/native/dbus-utils.h"
 #include "backends/native/meta-backend-native.h"
-#include "meta-cursor-renderer-native.h"
-#include "meta-renderer-native.h"
+#include "backends/native/meta-cursor-renderer-native.h"
+#include "backends/native/meta-renderer-native.h"
+#include "clutter/clutter.h"
+#include "clutter/evdev/clutter-evdev.h"
+
+#include "meta-dbus-login1.h"
 
 struct _MetaLauncher
 {

src/backends/native/meta-monitor-manager-kms.c

@@ -23,32 +23,30 @@
 
 #include "config.h"
 
-#include "meta-monitor-manager-kms.h"
-#include "meta-monitor-config-manager.h"
-#include "meta-backend-native.h"
-#include "meta-crtc.h"
-#include "meta-launcher.h"
-#include "meta-output.h"
-#include "meta-backend-private.h"
-#include "meta-renderer-native.h"
-#include "meta-crtc-kms.h"
-#include "meta-gpu-kms.h"
-#include "meta-output-kms.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <clutter/clutter.h>
+#include "backends/native/meta-monitor-manager-kms.h"
 
 #include <drm.h>
 #include <errno.h>
+#include <gudev/gudev.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include <meta/main.h>
-#include <meta/meta-x11-errors.h>
-
-#include <gudev/gudev.h>
+#include "backends/meta-backend-private.h"
+#include "backends/meta-crtc.h"
+#include "backends/meta-monitor-config-manager.h"
+#include "backends/meta-output.h"
+#include "backends/native/meta-backend-native.h"
+#include "backends/native/meta-crtc-kms.h"
+#include "backends/native/meta-gpu-kms.h"
+#include "backends/native/meta-launcher.h"
+#include "backends/native/meta-output-kms.h"
+#include "backends/native/meta-renderer-native.h"
+#include "clutter/clutter.h"
+#include "meta/main.h"
+#include "meta/meta-x11-errors.h"
 
 #define DRM_CARD_UDEV_DEVICE_TYPE "drm_minor"
 

src/backends/native/meta-monitor-manager-kms.h

@@ -26,7 +26,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
-#include "meta-monitor-manager-private.h"
+#include "backends/meta-monitor-manager-private.h"
 
 typedef struct _MetaGpuKms MetaGpuKms;
 

src/backends/native/meta-renderer-native-gles3.c

@@ -27,10 +27,10 @@
 
 #include "backends/native/meta-renderer-native-gles3.h"
 
+#include <GLES3/gl3.h>
 #include <drm_fourcc.h>
 #include <errno.h>
 #include <gio/gio.h>
-#include <GLES3/gl3.h>
 #include <string.h>
 
 #include "backends/meta-egl-ext.h"

src/backends/native/meta-renderer-native.c

@@ -37,6 +37,7 @@
 
 #include "config.h"
 
+#include <drm_fourcc.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <gbm.h>
@@ -47,21 +48,20 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #include <xf86drm.h>
-#include <drm_fourcc.h>
 
 #include "backends/meta-backend-private.h"
 #include "backends/meta-crtc.h"
-#include "backends/meta-gles3.h"
-#include "backends/meta-egl.h"
 #include "backends/meta-egl-ext.h"
+#include "backends/meta-egl.h"
+#include "backends/meta-gles3.h"
 #include "backends/meta-logical-monitor.h"
 #include "backends/meta-output.h"
 #include "backends/meta-renderer-view.h"
 #include "backends/native/meta-crtc-kms.h"
 #include "backends/native/meta-gpu-kms.h"
 #include "backends/native/meta-monitor-manager-kms.h"
-#include "backends/native/meta-renderer-native.h"
 #include "backends/native/meta-renderer-native-gles3.h"
+#include "backends/native/meta-renderer-native.h"
 #include "cogl/cogl.h"
 #include "core/boxes-private.h"
 

src/backends/x11/meta-backend-x11.c

@@ -24,29 +24,26 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <stdlib.h>
+#include "backends/x11/meta-backend-x11.h"
 
-#include "meta-backend-x11.h"
-
-#include <clutter.h>
-#include <clutter/x11/clutter-x11.h>
-
-#include <X11/extensions/sync.h>
 #include <X11/XKBlib.h>
 #include <X11/Xlib-xcb.h>
+#include <X11/extensions/sync.h>
+#include <stdlib.h>
+#include <string.h>
 #include <xkbcommon/xkbcommon-x11.h>
 
+#include "backends/meta-dnd-private.h"
+#include "backends/meta-idle-monitor-private.h"
 #include "backends/meta-stage-private.h"
 #include "backends/x11/meta-clutter-backend-x11.h"
 #include "backends/x11/meta-renderer-x11.h"
-#include "meta/meta-cursor-tracker.h"
-
-#include <meta/util.h>
-#include "display-private.h"
+#include "clutter/clutter.h"
+#include "clutter/x11/clutter-x11.h"
 #include "compositor/compositor-private.h"
-#include "backends/meta-dnd-private.h"
-#include "backends/meta-idle-monitor-private.h"
+#include "core/display-private.h"
+#include "meta/meta-cursor-tracker.h"
+#include "meta/util.h"
 
 struct _MetaBackendX11Private
 {

src/backends/x11/meta-backend-x11.h

@@ -25,11 +25,10 @@
 #ifndef META_BACKEND_X11_H
 #define META_BACKEND_X11_H
 
-#include "backends/meta-backend-private.h"
-
 #include <stdint.h>
 #include <X11/Xlib.h>
 
+#include "backends/meta-backend-private.h"
 #include "backends/x11/meta-clutter-backend-x11.h"
 
 #define META_TYPE_BACKEND_X11 (meta_backend_x11_get_type ())

src/backends/x11/meta-barrier-x11.c

@@ -34,12 +34,12 @@
 #ifdef HAVE_XI23
 
 #include <glib-object.h>
-
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xfixes.h>
-#include <meta/barrier.h>
+
 #include "backends/x11/meta-barrier-x11.h"
-#include "display-private.h"
+#include "core/display-private.h"
+#include "meta/barrier.h"
 #include "x11/meta-x11-display-private.h"
 
 struct _MetaBarrierImplX11Private

src/backends/x11/meta-clutter-backend-x11.c

@@ -30,10 +30,10 @@
 #include "backends/meta-renderer.h"
 #include "backends/x11/meta-clutter-backend-x11.h"
 #include "backends/x11/meta-stage-x11-nested.h"
-#include "clutter/clutter.h"
 #include "clutter/clutter-mutter.h"
-#include "meta/meta-backend.h"
+#include "clutter/clutter.h"
 #include "core/bell.h"
+#include "meta/meta-backend.h"
 
 struct _MetaClutterBackendX11
 {

src/backends/x11/meta-crtc-xrandr.c

@@ -35,8 +35,8 @@
 
 #include "backends/x11/meta-crtc-xrandr.h"
 
-#include <stdlib.h>
 #include <X11/Xlib-xcb.h>
+#include <stdlib.h>
 #include <xcb/randr.h>
 
 #include "backends/meta-crtc.h"

src/backends/x11/meta-cursor-renderer-x11.c

@@ -24,13 +24,13 @@
 
 #include "config.h"
 
-#include "meta-cursor-renderer-x11.h"
+#include "backends/x11/meta-cursor-renderer-x11.h"
 
 #include <X11/extensions/Xfixes.h>
 
-#include "meta-backend-x11.h"
-#include "meta-stage-private.h"
 #include "backends/meta-cursor-sprite-xcursor.h"
+#include "backends/meta-stage-private.h"
+#include "backends/x11/meta-backend-x11.h"
 
 struct _MetaCursorRendererX11Private
 {

src/backends/x11/meta-cursor-renderer-x11.h

@@ -25,7 +25,7 @@
 #ifndef META_CURSOR_RENDERER_X11_H
 #define META_CURSOR_RENDERER_X11_H
 
-#include "meta-cursor-renderer.h"
+#include "backends/meta-cursor-renderer.h"
 
 #define META_TYPE_CURSOR_RENDERER_X11             (meta_cursor_renderer_x11_get_type ())
 #define META_CURSOR_RENDERER_X11(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CURSOR_RENDERER_X11, MetaCursorRendererX11))

src/backends/x11/meta-input-settings-x11.c

@@ -23,20 +23,22 @@
 
 #include "config.h"
 
-#include "meta-backend-x11.h"
-#include "meta-input-settings-x11.h"
+#include "backends/x11/meta-input-settings-x11.h"
 
-#include <string.h>
 #include <gdk/gdkx.h>
+#include <string.h>
 #include <X11/Xatom.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/XKBlib.h>
+
 #ifdef HAVE_LIBGUDEV
 #include <gudev/gudev.h>
 #endif
 
-#include <meta/meta-x11-errors.h>
 #include "backends/meta-logical-monitor.h"
+#include "backends/x11/meta-backend-x11.h"
+#include "core/display-private.h"
+#include "meta/meta-x11-errors.h"
 
 typedef struct _MetaInputSettingsX11Private
 {

src/backends/x11/meta-input-settings-x11.h

@@ -22,7 +22,7 @@
 #ifndef META_INPUT_SETTINGS_X11_H
 #define META_INPUT_SETTINGS_X11_H
 
-#include "meta-input-settings-private.h"
+#include "backends/meta-input-settings-private.h"
 
 #define META_TYPE_INPUT_SETTINGS_X11             (meta_input_settings_x11_get_type ())
 #define META_INPUT_SETTINGS_X11(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_INPUT_SETTINGS_X11, MetaInputSettingsX11))

src/backends/x11/meta-monitor-manager-xrandr.c

@@ -25,28 +25,27 @@
 
 #include "config.h"
 
-#include "meta-monitor-manager-xrandr.h"
+#include "backends/x11/meta-monitor-manager-xrandr.h"
 
-#include <string.h>
-#include <stdlib.h>
 #include <math.h>
-#include <clutter/clutter.h>
-
+#include <stdlib.h>
+#include <string.h>
+#include <X11/Xlib-xcb.h>
 #include <X11/Xlibint.h>
 #include <X11/extensions/dpms.h>
-#include <X11/Xlib-xcb.h>
 #include <xcb/randr.h>
 
-#include "meta-backend-x11.h"
-#include <meta/main.h>
-#include <meta/meta-x11-errors.h>
 #include "backends/meta-crtc.h"
-#include "backends/meta-monitor-config-manager.h"
 #include "backends/meta-logical-monitor.h"
+#include "backends/meta-monitor-config-manager.h"
 #include "backends/meta-output.h"
+#include "backends/x11/meta-backend-x11.h"
 #include "backends/x11/meta-crtc-xrandr.h"
 #include "backends/x11/meta-gpu-xrandr.h"
 #include "backends/x11/meta-output-xrandr.h"
+#include "clutter/clutter.h"
+#include "meta/main.h"
+#include "meta/meta-x11-errors.h"
 
 /* Look for DPI_FALLBACK in:
  * http://git.gnome.org/browse/gnome-settings-daemon/tree/plugins/xsettings/gsd-xsettings-manager.c

src/backends/x11/meta-monitor-manager-xrandr.h

@@ -25,7 +25,7 @@
 
 #include <X11/extensions/Xrandr.h>
 
-#include "meta-monitor-manager-private.h"
+#include "backends/meta-monitor-manager-private.h"
 
 #define META_TYPE_MONITOR_MANAGER_XRANDR (meta_monitor_manager_xrandr_get_type ())
 G_DECLARE_FINAL_TYPE (MetaMonitorManagerXrandr, meta_monitor_manager_xrandr,

src/backends/x11/meta-renderer-x11.c

@@ -26,16 +26,16 @@
 
 #include <glib-object.h>
 
-#include "clutter/x11/clutter-x11.h"
-#include "cogl/cogl.h"
-#include "cogl/cogl-xlib.h"
-#include "cogl/winsys/cogl-winsys-glx-private.h"
-#include "cogl/winsys/cogl-winsys-egl-x11-private.h"
 #include "backends/meta-backend-private.h"
 #include "backends/meta-logical-monitor.h"
-#include "backends/meta-renderer.h"
 #include "backends/meta-renderer-view.h"
+#include "backends/meta-renderer.h"
 #include "backends/x11/meta-renderer-x11.h"
+#include "clutter/x11/clutter-x11.h"
+#include "cogl/cogl-xlib.h"
+#include "cogl/cogl.h"
+#include "cogl/winsys/cogl-winsys-egl-x11-private.h"
+#include "cogl/winsys/cogl-winsys-glx-private.h"
 #include "core/boxes-private.h"
 #include "meta/meta-backend.h"
 #include "meta/util.h"

src/compositor/clutter-utils.c

@@ -19,7 +19,10 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "clutter-utils.h"
+#include "config.h"
+
+#include "compositor/clutter-utils.h"
+
 #include <math.h>
 
 /* This file uses pixel-aligned region computation to determine what

src/compositor/clutter-utils.h

@@ -21,7 +21,8 @@
 #ifndef __META_CLUTTER_UTILS_H__
 #define __META_CLUTTER_UTILS_H__
 
-#include <clutter/clutter.h>
+#include "clutter/clutter.h"
+
 gboolean meta_actor_vertices_are_untransformed (ClutterVertex *verts,
                                                 float          widthf,
                                                 float          heightf,

src/compositor/cogl-utils.c

@@ -19,8 +19,10 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <clutter/clutter.h>
-#include "cogl-utils.h"
+#include "config.h"
+
+#include "clutter/clutter.h"
+#include "compositor/cogl-utils.h"
 
 /* Based on gnome-shell/src/st/st-private.c:_st_create_texture_material.c */
 

src/compositor/cogl-utils.h

@@ -21,7 +21,7 @@
 #ifndef __META_COGL_UTILS_H__
 #define __META_COGL_UTILS_H__
 
-#include <cogl/cogl.h>
+#include "cogl/cogl.h"
 
 CoglPipeline * meta_create_texture_pipeline (CoglTexture *texture);
 

src/compositor/compositor-private.h

@@ -5,11 +5,11 @@
 
 #include <X11/extensions/Xfixes.h>
 
-#include <meta/compositor.h>
-#include <meta/display.h>
-#include "meta-plugin-manager.h"
-#include "meta-window-actor-private.h"
-#include <clutter/clutter.h>
+#include "clutter/clutter.h"
+#include "compositor/meta-plugin-manager.h"
+#include "compositor/meta-window-actor-private.h"
+#include "meta/compositor.h"
+#include "meta/display.h"
 
 struct _MetaCompositor
 {

src/compositor/compositor.c

@@ -50,35 +50,34 @@
  * top window group.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <clutter/x11/clutter-x11.h>
+#include "compositor/compositor-private.h"
 
-#include "core.h"
-#include <meta/meta-x11-errors.h>
-#include <meta/window.h>
-#include "compositor-private.h"
-#include <meta/compositor-mutter.h>
-#include <meta/prefs.h>
-#include <meta/main.h>
-#include <meta/meta-backend.h>
-#include <meta/meta-background-actor.h>
-#include <meta/meta-background-group.h>
-#include <meta/meta-shadow-factory.h>
-#include "meta-window-actor-private.h"
-#include "meta-window-group-private.h"
-#include "window-private.h" /* to check window->hidden */
-#include "display-private.h" /* for meta_display_lookup_x_window() and meta_display_cancel_touch() */
-#include "util-private.h"
-#include "backends/meta-dnd-private.h"
-#include "frame.h"
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xcomposite.h>
-#include "meta-sync-ring.h"
 
+#include "backends/meta-dnd-private.h"
 #include "backends/x11/meta-backend-x11.h"
 #include "clutter/clutter-mutter.h"
-
+#include "clutter/x11/clutter-x11.h"
+#include "compositor/meta-sync-ring.h"
+#include "compositor/meta-window-actor-private.h"
+#include "compositor/meta-window-group-private.h"
+#include "core/core.h"
+#include "core/display-private.h"
+#include "core/frame.h"
+#include "core/util-private.h"
+#include "core/window-private.h"
+#include "meta/compositor-mutter.h"
+#include "meta/main.h"
+#include "meta/meta-backend.h"
+#include "meta/meta-background-actor.h"
+#include "meta/meta-background-group.h"
+#include "meta/meta-shadow-factory.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
+#include "meta/window.h"
 #include "x11/meta-x11-display-private.h"
 
 #ifdef HAVE_WAYLAND

src/compositor/meta-background-actor-private.h

@@ -3,7 +3,7 @@
 #ifndef META_BACKGROUND_ACTOR_PRIVATE_H
 #define META_BACKGROUND_ACTOR_PRIVATE_H
 
-#include <meta/meta-background-actor.h>
+#include "meta/meta-background-actor.h"
 
 cairo_region_t *meta_background_actor_get_clip_region (MetaBackgroundActor *self);
 

src/compositor/meta-background-actor.c

@@ -72,17 +72,17 @@
  * adding the vignette and opacity.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <clutter/clutter.h>
+#include "compositor/meta-background-actor-private.h"
 
-#include "cogl-utils.h"
-#include "clutter-utils.h"
-#include <meta/meta-x11-errors.h>
-#include "meta-background-actor-private.h"
-#include "meta-background-private.h"
-#include "meta-cullable.h"
+#include "clutter/clutter.h"
+#include "compositor/clutter-utils.h"
+#include "compositor/cogl-utils.h"
+#include "compositor/meta-background-private.h"
+#include "compositor/meta-cullable.h"
 #include "meta/display.h"
+#include "meta/meta-x11-errors.h"
 
 enum
 {

src/compositor/meta-background-group.c

@@ -14,10 +14,10 @@
  * and details on implementation.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <meta/meta-background-group.h>
-#include "meta-cullable.h"
+#include "compositor/meta-cullable.h"
+#include "meta/meta-background-group.h"
 
 static void cullable_iface_init (MetaCullableInterface *iface);
 

src/compositor/meta-background-image.c

@@ -22,13 +22,15 @@
  * @short_description: objects holding images loaded from files, used for backgrounds
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "meta/meta-background-image.h"
 
-#include <gio/gio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <clutter/clutter.h>
-#include <meta/meta-background-image.h>
-#include "cogl-utils.h"
+#include <gio/gio.h>
+
+#include "clutter/clutter.h"
+#include "compositor/cogl-utils.h"
 
 enum
 {

src/compositor/meta-background-private.h

@@ -3,9 +3,8 @@
 #ifndef META_BACKGROUND_PRIVATE_H
 #define META_BACKGROUND_PRIVATE_H
 
-#include <config.h>
-
-#include "meta-background-private.h"
+#include "cogl/cogl.h"
+#include "meta/meta-background.h"
 
 CoglTexture *meta_background_get_texture (MetaBackground         *self,
                                           int                     monitor_index,

src/compositor/meta-background.c

@@ -17,16 +17,19 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <meta/display.h>
-#include <meta/util.h>
-#include <meta/meta-background.h>
-#include <meta/meta-background-image.h>
-#include <meta/meta-monitor-manager.h>
-#include "meta-background-private.h"
-#include "cogl-utils.h"
+#include "config.h"
+
+#include "compositor/meta-background-private.h"
 
 #include <string.h>
 
+#include "compositor/cogl-utils.h"
+#include "meta/display.h"
+#include "meta/meta-background-image.h"
+#include "meta/meta-background.h"
+#include "meta/meta-monitor-manager.h"
+#include "meta/util.h"
+
 enum
 {
   CHANGED,

src/compositor/meta-cullable.c

@@ -22,8 +22,9 @@
  */
 
 #include "config.h"
-#include "meta-cullable.h"
-#include "clutter-utils.h"
+
+#include "compositor/clutter-utils.h"
+#include "compositor/meta-cullable.h"
 
 G_DEFINE_INTERFACE (MetaCullable, meta_cullable, CLUTTER_TYPE_ACTOR);
 

src/compositor/meta-cullable.h

@@ -25,7 +25,7 @@
 #ifndef __META_CULLABLE_H__
 #define __META_CULLABLE_H__
 
-#include <clutter/clutter.h>
+#include "clutter/clutter.h"
 
 G_BEGIN_DECLS
 

src/compositor/meta-dnd-actor-private.h

@@ -23,7 +23,7 @@
 #ifndef META_DND_ACTOR_PRIVATE_H
 #define META_DND_ACTOR_PRIVATE_H
 
-#include "meta-feedback-actor-private.h"
+#include "compositor/meta-feedback-actor-private.h"
 
 /**
  * MetaDnDActor:

src/compositor/meta-dnd-actor.c

@@ -25,11 +25,11 @@
  *
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <clutter/clutter.h>
+#include "compositor/meta-dnd-actor-private.h"
 
-#include "meta-dnd-actor-private.h"
+#include "clutter/clutter.h"
 
 #define DRAG_FAILED_DURATION 500
 

src/compositor/meta-feedback-actor-private.h

@@ -23,7 +23,7 @@
 #ifndef META_FEEDBACK_ACTOR_PRIVATE_H
 #define META_FEEDBACK_ACTOR_PRIVATE_H
 
-#include <clutter/clutter.h>
+#include "clutter/clutter.h"
 
 /**
  * MetaFeedbackActor:

src/compositor/meta-feedback-actor.c

@@ -24,11 +24,11 @@
  * @short_description: Actor for painting user interaction feedback
  */
 
-#include <config.h>
+#include "config.h"
 
-#include "display-private.h"
-#include "compositor-private.h"
-#include "meta-feedback-actor-private.h"
+#include "compositor/compositor-private.h"
+#include "compositor/meta-feedback-actor-private.h"
+#include "core/display-private.h"
 
 enum {
   PROP_ANCHOR_X = 1,

src/compositor/meta-module.c

@@ -19,12 +19,15 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <meta/meta-plugin.h>
-#include <meta/meta-version.h>
-#include "meta-module.h"
+#include "config.h"
+
+#include "compositor/meta-module.h"
 
 #include <gmodule.h>
 
+#include "meta/meta-plugin.h"
+#include "meta/meta-version.h"
+
 enum
 {
   PROP_0,

src/compositor/meta-plugin-manager.c

@@ -20,20 +20,21 @@
  */
 
 #include "config.h"
-#include "compositor-private.h"
-#include "meta-plugin-manager.h"
-#include <meta/prefs.h>
-#include <meta/meta-x11-errors.h>
-#include <meta/workspace.h>
-#include "meta-module.h"
-#include "window-private.h"
-#include "meta-close-dialog-default-private.h"
-#include "meta-inhibit-shortcuts-dialog-default-private.h"
 
-#include <string.h>
+#include "compositor/meta-plugin-manager.h"
+
 #include <stdlib.h>
+#include <string.h>
 
-#include <clutter/x11/clutter-x11.h>
+#include "clutter/x11/clutter-x11.h"
+#include "compositor/compositor-private.h"
+#include "compositor/meta-module.h"
+#include "core/meta-close-dialog-default-private.h"
+#include "core/meta-inhibit-shortcuts-dialog-default-private.h"
+#include "core/window-private.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
+#include "meta/workspace.h"
 
 static GType plugin_type = G_TYPE_NONE;
 

src/compositor/meta-plugin-manager.h

@@ -22,8 +22,8 @@
 #ifndef META_PLUGIN_MANAGER_H_
 #define META_PLUGIN_MANAGER_H_
 
-#include <meta/types.h>
-#include <meta/meta-plugin.h>
+#include "meta/meta-plugin.h"
+#include "meta/types.h"
 
 typedef enum {
   META_PLUGIN_NONE,

src/compositor/meta-plugin.c

@@ -26,20 +26,22 @@
  *
  */
 
-#include <meta/meta-plugin.h>
-#include "meta-plugin-manager.h"
-#include <meta/display.h>
-#include <meta/util.h>
+#include "config.h"
+
+#include "meta/meta-plugin.h"
 
 #include <string.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/shape.h>
-#include <clutter/x11/clutter-x11.h>
 
-#include "compositor-private.h"
-#include "meta-window-actor-private.h"
-#include "meta-monitor-manager-private.h"
+#include "backends/meta-monitor-manager-private.h"
+#include "clutter/x11/clutter-x11.h"
+#include "compositor/compositor-private.h"
+#include "compositor/meta-window-actor-private.h"
+#include "compositor/meta-plugin-manager.h"
+#include "meta/display.h"
+#include "meta/util.h"
 
 struct _MetaPluginPrivate
 {

src/compositor/meta-shadow-factory.c

@@ -22,15 +22,15 @@
  * @short_description: Create and cache shadow textures for abritrary window shapes
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <math.h>
 #include <string.h>
 
-#include <meta/meta-shadow-factory.h>
-#include <meta/util.h>
-
-#include "cogl-utils.h"
-#include "region-utils.h"
+#include "compositor/cogl-utils.h"
+#include "compositor/region-utils.h"
+#include "meta/meta-shadow-factory.h"
+#include "meta/util.h"
 
 /* This file implements blurring the shape of a window to produce a
  * shadow texture. The details are discussed below; a quick summary

src/compositor/meta-shaped-texture-private.h

@@ -27,7 +27,7 @@
 #ifndef __META_SHAPED_TEXTURE_PRIVATE_H__
 #define __META_SHAPED_TEXTURE_PRIVATE_H__
 
-#include <meta/meta-shaped-texture.h>
+#include "meta/meta-shaped-texture.h"
 
 ClutterActor *meta_shaped_texture_new (void);
 void meta_shaped_texture_set_texture (MetaShapedTexture *stex,

src/compositor/meta-shaped-texture.c

@@ -25,19 +25,18 @@
  * @short_description: An actor to draw a masked texture.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <meta/meta-shaped-texture.h>
-#include "meta-shaped-texture-private.h"
+#include "compositor/meta-shaped-texture-private.h"
 
-#include <cogl/cogl.h>
-#include <gdk/gdk.h> /* for gdk_rectangle_intersect() */
+#include <gdk/gdk.h>
 
-#include "clutter-utils.h"
-#include "meta-texture-tower.h"
-#include "region-utils.h"
-
-#include "meta-cullable.h"
+#include "cogl/cogl.h"
+#include "compositor/clutter-utils.h"
+#include "compositor/region-utils.h"
+#include "compositor/meta-cullable.h"
+#include "compositor/meta-texture-tower.h"
+#include "meta/meta-shaped-texture.h"
 
 /* MAX_MIPMAPPING_FPS needs to be as small as possible for the best GPU
  * performance, but higher than the refresh rate of commonly slow updating

src/compositor/meta-surface-actor-wayland.c

@@ -24,20 +24,19 @@
 
 #include "config.h"
 
-#include "meta-surface-actor-wayland.h"
+#include "compositor/meta-surface-actor-wayland.h"
 
 #include <math.h>
-#include <cogl/cogl-wayland-server.h>
-#include "meta-shaped-texture-private.h"
 
+#include "backends/meta-backend-private.h"
 #include "backends/meta-logical-monitor.h"
+#include "cogl/cogl-wayland-server.h"
+#include "compositor/meta-shaped-texture-private.h"
+#include "compositor/region-utils.h"
 #include "wayland/meta-wayland-buffer.h"
 #include "wayland/meta-wayland-private.h"
 #include "wayland/meta-window-wayland.h"
 
-#include "backends/meta-backend-private.h"
-#include "compositor/region-utils.h"
-
 typedef struct _MetaSurfaceActorWaylandPrivate
 {
   MetaWaylandSurface *surface;

src/compositor/meta-surface-actor-wayland.h

@@ -27,12 +27,10 @@
 
 #include <glib-object.h>
 
-#include "meta-surface-actor.h"
-
-#include "wayland/meta-wayland.h"
-#include "wayland/meta-wayland-private.h"
-
 #include "backends/meta-monitor-manager-private.h"
+#include "compositor/meta-surface-actor.h"
+#include "wayland/meta-wayland-private.h"
+#include "wayland/meta-wayland.h"
 
 G_BEGIN_DECLS
 

src/compositor/meta-surface-actor-x11.c

@@ -25,17 +25,17 @@
 
 #include "config.h"
 
-#include "meta-surface-actor-x11.h"
+#include "compositor/meta-surface-actor-x11.h"
 
 #include <X11/extensions/Xcomposite.h>
-#include <cogl/winsys/cogl-texture-pixmap-x11.h>
 
-#include <meta/meta-x11-errors.h>
-#include "window-private.h"
-#include "meta-shaped-texture-private.h"
-#include "meta-cullable.h"
-#include "x11/window-x11.h"
+#include "cogl/winsys/cogl-texture-pixmap-x11.h"
+#include "compositor/meta-cullable.h"
+#include "compositor/meta-shaped-texture-private.h"
+#include "core/window-private.h"
+#include "meta/meta-x11-errors.h"
 #include "x11/meta-x11-display-private.h"
+#include "x11/window-x11.h"
 
 struct _MetaSurfaceActorX11Private
 {

src/compositor/meta-surface-actor-x11.h

@@ -28,12 +28,11 @@
 
 #include <glib-object.h>
 
-#include "meta-surface-actor.h"
-
 #include <X11/extensions/Xdamage.h>
 
-#include <meta/display.h>
-#include <meta/window.h>
+#include "compositor/meta-surface-actor.h"
+#include "meta/display.h"
+#include "meta/window.h"
 
 G_BEGIN_DECLS
 

src/compositor/meta-surface-actor.c

@@ -9,14 +9,14 @@
  * used to draw the content of a window.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include "meta-surface-actor.h"
+#include "compositor/meta-surface-actor.h"
 
-#include <clutter/clutter.h>
-#include <meta/meta-shaped-texture.h>
-#include "meta-cullable.h"
-#include "meta-shaped-texture-private.h"
+#include "clutter/clutter.h"
+#include "compositor/meta-cullable.h"
+#include "compositor/meta-shaped-texture-private.h"
+#include "meta/meta-shaped-texture.h"
 
 struct _MetaSurfaceActorPrivate
 {

src/compositor/meta-surface-actor.h

@@ -3,10 +3,10 @@
 #ifndef META_SURFACE_ACTOR_PRIVATE_H
 #define META_SURFACE_ACTOR_PRIVATE_H
 
-#include <config.h>
+#include "config.h"
 
-#include <meta/meta-shaped-texture.h>
-#include <meta/window.h>
+#include "meta/meta-shaped-texture.h"
+#include "meta/window.h"
 
 G_BEGIN_DECLS
 

src/compositor/meta-sync-ring.c

@@ -28,18 +28,18 @@
  * Authors: James Jones <jajones@nvidia.com>
  */
 
-#include <string.h>
+#include "config.h"
 
+#include "compositor/meta-sync-ring.h"
+
+#include <string.h>
 #include <GL/gl.h>
 #include <GL/glx.h>
 #include <X11/extensions/sync.h>
 
-#include <cogl/cogl.h>
-#include <clutter/clutter.h>
-
-#include <meta/util.h>
-
-#include "meta-sync-ring.h"
+#include "clutter/clutter.h"
+#include "cogl/cogl.h"
+#include "meta/util.h"
 
 /* Theory of operation:
  *