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/core/bell.c

@@ -47,16 +47,19 @@
  * things with bells; some others are entirely no-ops in that case.
  */
 
-#include <config.h>
-#include "bell.h"
-#include "window-private.h"
-#include "util-private.h"
-#include "compositor/compositor-private.h"
-#include <meta/compositor.h>
+#include "config.h"
+
+#include "core/bell.h"
+
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
 #endif
 
+#include "compositor/compositor-private.h"
+#include "core/util-private.h"
+#include "core/window-private.h"
+#include "meta/compositor.h"
+
 G_DEFINE_TYPE (MetaBell, meta_bell, G_TYPE_OBJECT)
 
 enum

src/core/bell.h

@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "display-private.h"
-#include "frame.h"
+#include "core/display-private.h"
+#include "core/frame.h"
 
 struct _MetaBell
 {

src/core/boxes-private.h

@@ -23,8 +23,9 @@
 #define META_BOXES_PRIVATE_H
 
 #include <glib-object.h>
-#include <meta/common.h>
-#include <meta/boxes.h>
+
+#include "meta/boxes.h"
+#include "meta/common.h"
 
 #define BOX_LEFT(box)    ((box).x)                /* Leftmost pixel of rect */
 #define BOX_RIGHT(box)   ((box).x + (box).width)  /* One pixel past right   */

src/core/boxes.c

@@ -28,9 +28,13 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "boxes-private.h"
-#include <meta/util.h>
-#include <X11/Xutil.h>  /* Just for the definition of the various gravities */
+#include "config.h"
+
+#include "core/boxes-private.h"
+
+#include <X11/Xutil.h>
+
+#include "meta/util.h"
 
 /* It would make sense to use GSlice here, but until we clean up the
  * rest of this file and the internal API to use these functions, we

src/core/constraints.c

@@ -21,20 +21,22 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "boxes-private.h"
-#include "constraints.h"
-#include "meta-workspace-manager-private.h"
-#include "workspace-private.h"
-#include "place.h"
-#include <meta/prefs.h>
-#include "backends/meta-backend-private.h"
-#include "backends/meta-logical-monitor.h"
-#include "backends/meta-monitor-manager-private.h"
+#include "config.h"
+
+#include "core/constraints.h"
 
 #include <stdlib.h>
 #include <math.h>
 
+#include "backends/meta-backend-private.h"
+#include "backends/meta-logical-monitor.h"
+#include "backends/meta-monitor-manager-private.h"
+#include "core/boxes-private.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/place.h"
+#include "core/workspace-private.h"
+#include "meta/prefs.h"
+
 #if 0
  // This is the short and sweet version of how to hack on this file; see
  // doc/how-constraints-works.txt for the gory details.  The basics of

src/core/constraints.h

@@ -23,9 +23,9 @@
 #ifndef META_CONSTRAINTS_H
 #define META_CONSTRAINTS_H
 
-#include <meta/util.h>
-#include "window-private.h"
-#include "frame.h"
+#include "core/frame.h"
+#include "core/window-private.h"
+#include "meta/util.h"
 
 void meta_window_constrain (MetaWindow          *window,
                             MetaMoveResizeFlags  flags,

src/core/core.c

@@ -21,18 +21,18 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "core.h"
-#include "frame.h"
-#include "meta-workspace-manager-private.h"
-#include "workspace-private.h"
-#include <meta/prefs.h>
-#include <meta/meta-x11-errors.h>
-#include "util-private.h"
+#include "config.h"
 
+#include "core/core.h"
+#include "core/frame.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/util-private.h"
+#include "core/workspace-private.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
 #include "x11/meta-x11-display-private.h"
-#include "x11/window-x11.h"
 #include "x11/window-x11-private.h"
+#include "x11/window-x11.h"
 
 /* Looks up the MetaWindow representing the frame of the given X window.
  * Used as a helper function by a bunch of the functions below.

src/core/core.h

@@ -23,10 +23,10 @@
 #ifndef META_CORE_H
 #define META_CORE_H
 
-/* Don't include core headers here */
 #include <gdk/gdkx.h>
-#include <meta/common.h>
-#include <meta/boxes.h>
+
+#include "meta/boxes.h"
+#include "meta/common.h"
 
 void meta_core_queue_frame_resize (Display *xdisplay,
                                    Window frame_xwindow);

src/core/delete.c

@@ -22,14 +22,16 @@
 
 #define _XOPEN_SOURCE /* for kill() */
 
-#include <config.h>
-#include "util-private.h"
-#include "window-private.h"
-#include "compositor-private.h"
-#include <meta/meta-x11-errors.h>
-#include <meta/workspace.h>
+#include "config.h"
+
 #include <errno.h>
 
+#include "compositor/compositor-private.h"
+#include "core/util-private.h"
+#include "core/window-private.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/workspace.h"
+
 static void
 close_dialog_response_cb (MetaCloseDialog         *dialog,
                           MetaCloseDialogResponse  response,

src/core/display-private.h

@@ -25,28 +25,25 @@
 #ifndef META_DISPLAY_PRIVATE_H
 #define META_DISPLAY_PRIVATE_H
 
-#ifndef PACKAGE
-#error "config.h not included"
-#endif
+#include "meta/display.h"
 
 #include <glib.h>
+#include <X11/extensions/sync.h>
 #include <X11/Xlib.h>
-#include <meta/common.h>
-#include <meta/boxes.h>
-#include <meta/display.h>
-#include "keybindings-private.h"
-#include "startup-notification-private.h"
-#include "meta-gesture-tracker-private.h"
-#include "stack-tracker.h"
-#include <meta/prefs.h>
-#include <meta/barrier.h>
-#include <clutter/clutter.h>
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 #include <libsn/sn.h>
 #endif
 
-#include <X11/extensions/sync.h>
+#include "clutter/clutter.h"
+#include "core/keybindings-private.h"
+#include "core/meta-gesture-tracker-private.h"
+#include "core/stack-tracker.h"
+#include "core/startup-notification-private.h"
+#include "meta/barrier.h"
+#include "meta/boxes.h"
+#include "meta/common.h"
+#include "meta/prefs.h"
 
 typedef struct _MetaBell       MetaBell;
 typedef struct _MetaStack      MetaStack;

src/core/display.c

@@ -30,52 +30,51 @@
 
 #define _XOPEN_SOURCE 600 /* for gethostname() */
 
-#include <config.h>
-#include "display-private.h"
-#include "events.h"
-#include "util-private.h"
-#include <meta/main.h>
-#include "main-private.h"
-#include "window-private.h"
-#include "boxes-private.h"
-#include "frame.h"
-#include <meta/meta-x11-errors.h>
-#include "keybindings-private.h"
-#include <meta/prefs.h>
-#include "workspace-private.h"
-#include "meta-workspace-manager-private.h"
-#include "bell.h"
-#include <meta/compositor.h>
-#include <meta/compositor-mutter.h>
+#include "config.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <X11/Xatom.h>
-#include <meta/meta-enum-types.h>
-#include "meta-idle-monitor-dbus.h"
-#include "meta-cursor-tracker-private.h"
-#include <meta/meta-backend.h>
-#include "backends/meta-cursor-sprite-xcursor.h"
-#include "backends/meta-logical-monitor.h"
-#include "backends/native/meta-backend-native.h"
-#include "backends/x11/meta-backend-x11.h"
-#include "backends/meta-stage-private.h"
-#include "backends/meta-input-settings-private.h"
-#include <clutter/x11/clutter-x11.h>
+#include <X11/Xcursor/Xcursor.h>
+#include <X11/extensions/shape.h>
+#include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/Xdamage.h>
+#include <X11/extensions/Xfixes.h>
 
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
 #endif
-#include <X11/extensions/shape.h>
-#include <X11/Xcursor/Xcursor.h>
-#include <X11/extensions/Xcomposite.h>
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xfixes.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
-#include "x11/events.h"
+#include "backends/meta-cursor-sprite-xcursor.h"
+#include "backends/meta-cursor-tracker-private.h"
+#include "backends/meta-idle-monitor-dbus.h"
+#include "backends/meta-input-settings-private.h"
+#include "backends/meta-logical-monitor.h"
+#include "backends/meta-stage-private.h"
+#include "backends/x11/meta-backend-x11.h"
+#include "clutter/x11/clutter-x11.h"
+#include "core/bell.h"
+#include "core/boxes-private.h"
+#include "core/display-private.h"
+#include "core/events.h"
+#include "core/frame.h"
+#include "core/keybindings-private.h"
+#include "core/main-private.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/util-private.h"
+#include "core/window-private.h"
+#include "core/workspace-private.h"
+#include "meta/compositor-mutter.h"
+#include "meta/compositor.h"
+#include "meta/main.h"
+#include "meta/meta-backend.h"
+#include "meta/meta-enum-types.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
+#include "x11/meta-x11-display-private.h"
 #include "x11/window-x11.h"
 #include "x11/xprops.h"
-#include "x11/meta-x11-display-private.h"
 
 #ifdef HAVE_WAYLAND
 #include "wayland/meta-xwayland-private.h"
@@ -83,6 +82,10 @@
 #include "wayland/meta-wayland-tablet-pad.h"
 #endif
 
+#ifdef HAVE_NATIVE_BACKEND
+#include "backends/native/meta-backend-native.h"
+#endif
+
 /*
  * SECTION:pings
  *

src/core/edge-resistance.c

@@ -19,12 +19,14 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "edge-resistance.h"
-#include "boxes-private.h"
-#include "display-private.h"
-#include "meta-workspace-manager-private.h"
-#include "workspace-private.h"
+#include "config.h"
+
+#include "core/edge-resistance.h"
+
+#include "core/boxes-private.h"
+#include "core/display-private.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/workspace-private.h"
 
 /* A simple macro for whether a given window's edges are potentially
  * relevant for resistance/snapping during a move/resize operation

src/core/edge-resistance.h

@@ -22,7 +22,7 @@
 #ifndef META_EDGE_RESISTANCE_H
 #define META_EDGE_RESISTANCE_H
 
-#include "window-private.h"
+#include "core/window-private.h"
 
 void        meta_window_edge_resistance_for_move   (MetaWindow  *window,
                                                     int         *new_x,

src/core/events.c

@@ -21,25 +21,24 @@
  */
 
 #include "config.h"
-#include "events.h"
 
-#include <meta/meta-backend.h>
+#include "core/events.h"
 
-#include "display-private.h"
-#include "window-private.h"
-#include "backends/x11/meta-backend-x11.h"
 #include "backends/meta-cursor-tracker-private.h"
+#include "backends/meta-idle-monitor-private.h"
+#include "backends/x11/meta-backend-x11.h"
+#include "compositor/meta-surface-actor.h"
+#include "core/display-private.h"
+#include "core/window-private.h"
+#include "meta/meta-backend.h"
 
 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-backend-native.h"
 #endif
 
-#include "backends/meta-idle-monitor-private.h"
-
 #ifdef HAVE_WAYLAND
 #include "wayland/meta-wayland-private.h"
 #endif
-#include "meta-surface-actor.h"
 
 #define IS_GESTURE_EVENT(e) ((e)->type == CLUTTER_TOUCHPAD_SWIPE || \
                              (e)->type == CLUTTER_TOUCHPAD_PINCH || \

src/core/events.h

@@ -20,11 +20,11 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <meta/display.h>
-
 #ifndef META_EVENTS_H
 #define META_EVENTS_H
 
+#include "meta/display.h"
+
 void meta_display_init_events (MetaDisplay *display);
 void meta_display_free_events (MetaDisplay *display);
 

src/core/frame.c

@@ -21,12 +21,14 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "frame.h"
-#include "bell.h"
-#include <meta/meta-x11-errors.h>
-#include "keybindings-private.h"
+#include "config.h"
+
+#include "core/frame.h"
+
 #include "backends/x11/meta-backend-x11.h"
+#include "core/bell.h"
+#include "core/keybindings-private.h"
+#include "meta/meta-x11-errors.h"
 #include "x11/meta-x11-display-private.h"
 
 #define EVENT_MASK (SubstructureRedirectMask |                     \

src/core/frame.h

@@ -22,8 +22,7 @@
 #ifndef META_FRAME_PRIVATE_H
 #define META_FRAME_PRIVATE_H
 
-#include "window-private.h"
-
+#include "core/window-private.h"
 #include "ui/frames.h"
 
 struct _MetaFrame

src/core/keybindings-private.h

@@ -28,9 +28,10 @@
 #define META_KEYBINDINGS_PRIVATE_H
 
 #include <gio/gio.h>
-#include <meta/keybindings.h>
 #include <xkbcommon/xkbcommon.h>
-#include "meta-accel-parse.h"
+
+#include "core/meta-accel-parse.h"
+#include "meta/keybindings.h"
 
 typedef struct _MetaKeyHandler MetaKeyHandler;
 struct _MetaKeyHandler

src/core/keybindings.c

@@ -27,27 +27,21 @@
  * @Short_Description: Key bindings
  */
 
-#include <config.h>
-#include "keybindings-private.h"
-#include "meta-workspace-manager-private.h"
-#include "workspace-private.h"
-#include <meta/compositor.h>
-#include <meta/meta-x11-errors.h>
-#include "edge-resistance.h"
-#include "frame.h"
-#include <meta/prefs.h>
-#include "meta-accel-parse.h"
-
-#ifdef __linux__
-#include <linux/input.h>
-#elif !defined KEY_GRAVE
-#define KEY_GRAVE 0x29 /* assume the use of xf86-input-keyboard */
-#endif
+#include "config.h"
 
 #include "backends/meta-backend-private.h"
-#include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-logical-monitor.h"
+#include "backends/meta-monitor-manager-private.h"
 #include "backends/x11/meta-backend-x11.h"
+#include "core/edge-resistance.h"
+#include "core/frame.h"
+#include "core/keybindings-private.h"
+#include "core/meta-accel-parse.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/workspace-private.h"
+#include "meta/compositor.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
 #include "x11/meta-x11-display-private.h"
 #include "x11/window-x11.h"
 
@@ -55,6 +49,12 @@
 #include "backends/native/meta-backend-native.h"
 #endif
 
+#ifdef __linux__
+#include <linux/input.h>
+#elif !defined KEY_GRAVE
+#define KEY_GRAVE 0x29 /* assume the use of xf86-input-keyboard */
+#endif
+
 #define SCHEMA_COMMON_KEYBINDINGS "org.gnome.desktop.wm.keybindings"
 #define SCHEMA_MUTTER_KEYBINDINGS "org.gnome.mutter.keybindings"
 #define SCHEMA_MUTTER_WAYLAND_KEYBINDINGS "org.gnome.mutter.wayland.keybindings"

src/core/main.c

@@ -43,56 +43,55 @@
 
 #define _XOPEN_SOURCE /* for putenv() and some signal-related functions */
 
-#include <config.h>
-#include <meta/main.h>
-#include "util-private.h"
-#include "display-private.h"
-#include <meta/meta-x11-errors.h>
-#include "ui.h"
-#include <meta/prefs.h>
-#include <meta/compositor.h>
-#include <meta/meta-backend.h>
-#include "core/main-private.h"
+#include "config.h"
 
-#include <glib-object.h>
-#include <glib-unix.h>
+#include "meta/main.h"
 
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <string.h>
-#include <signal.h>
-#include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <glib-object.h>
+#include <glib-unix.h>
 #include <locale.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
-
-#include <clutter/clutter.h>
+#include <unistd.h>
 
 #ifdef HAVE_INTROSPECTION
 #include <girepository.h>
 #endif
 
+#if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND)
+#include <systemd/sd-login.h>
+#endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */
+
+#include "backends/meta-backend-private.h"
+#include "backends/x11/cm/meta-backend-x11-cm.h"
+#include "backends/x11/meta-backend-x11.h"
+#include "clutter/clutter.h"
+#include "core/display-private.h"
+#include "core/main-private.h"
+#include "core/util-private.h"
+#include "meta/compositor.h"
+#include "meta/meta-backend.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
+#include "ui/ui.h"
 #include "x11/session.h"
 
 #ifdef HAVE_WAYLAND
-#include "wayland/meta-wayland.h"
 #include "backends/x11/nested/meta-backend-x11-nested.h"
-# endif
-
-#include "backends/meta-backend-private.h"
-#include "backends/x11/meta-backend-x11.h"
-#include "backends/x11/cm/meta-backend-x11-cm.h"
+#include "wayland/meta-wayland.h"
+#endif
 
 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-backend-native.h"
-#ifdef HAVE_WAYLAND
-#include <systemd/sd-login.h>
-#endif /* HAVE_WAYLAND */
-#endif /* HAVE_NATIVE_BACKEND */
+#endif
 
 /*
  * The exit code we'll return to our parent process when we eventually die.

src/core/meta-accel-parse.c

@@ -24,12 +24,13 @@
 
 #include "config.h"
 
-#include "meta-accel-parse.h"
-#include "keybindings-private.h"
+#include "core/meta-accel-parse.h"
 
-#include <xkbcommon/xkbcommon.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
+#include <xkbcommon/xkbcommon.h>
+
+#include "core/keybindings-private.h"
 
 /* This is copied from GTK+ and modified to work with mutter's
  * internal structures. Originating code comes from gtk/gtkaccelgroup.c

src/core/meta-accel-parse.h

@@ -25,7 +25,8 @@
 #define META_ACCEL_PARSE_H
 
 #include <glib.h>
-#include <meta/common.h>
+
+#include "meta/common.h"
 
 typedef struct _MetaKeyCombo MetaKeyCombo;
 

src/core/meta-close-dialog-default-private.h

@@ -22,6 +22,10 @@
 #ifndef META_CLOSE_DIALOG_DEFAULT_H
 #define META_CLOSE_DIALOG_DEFAULT_H
 
+#include <glib-object.h>
+
+#include "meta/meta-plugin.h"
+
 #define META_TYPE_CLOSE_DIALOG_DEFAULT (meta_close_dialog_default_get_type ())
 G_DECLARE_FINAL_TYPE (MetaCloseDialogDefault,
                       meta_close_dialog_default,

src/core/meta-close-dialog-default.c

@@ -23,17 +23,19 @@
 
 #define _XOPEN_SOURCE /* for kill() */
 
-#include <config.h>
-#include "util-private.h"
-#include "window-private.h"
-#include <meta/meta-close-dialog.h>
-#include "meta-close-dialog-default-private.h"
-#include "x11/meta-x11-display-private.h"
+#include "config.h"
+
+#include "core/meta-close-dialog-default-private.h"
+#include "meta/meta-close-dialog.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <signal.h>
 
+#include "core/util-private.h"
+#include "core/window-private.h"
+#include "x11/meta-x11-display-private.h"
+
 typedef struct _MetaCloseDialogDefaultPrivate MetaCloseDialogDefaultPrivate;
 
 struct _MetaCloseDialogDefault

src/core/meta-close-dialog.c

@@ -20,7 +20,8 @@
  */
 
 #include "config.h"
-#include "window-private.h"
+
+#include "core/window-private.h"
 #include "meta/meta-close-dialog.h"
 #include "meta/meta-enum-types.h"
 

src/core/meta-gesture-tracker-private.h

@@ -25,8 +25,9 @@
 #define META_GESTURE_TRACKER_PRIVATE_H
 
 #include <glib-object.h>
-#include <clutter/clutter.h>
-#include <meta/window.h>
+
+#include "clutter/clutter.h"
+#include "meta/window.h"
 
 #define META_TYPE_GESTURE_TRACKER            (meta_gesture_tracker_get_type ())
 #define META_GESTURE_TRACKER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_GESTURE_TRACKER, MetaGestureTracker))

src/core/meta-gesture-tracker.c

@@ -29,8 +29,10 @@
  */
 
 #include "config.h"
-#include "meta-gesture-tracker-private.h"
-#include "meta-surface-actor.h"
+
+#include "core/meta-gesture-tracker-private.h"
+
+#include "compositor/meta-surface-actor.h"
 
 #define DISTANCE_THRESHOLD 30
 

src/core/meta-inhibit-shortcuts-dialog-default-private.h

@@ -19,6 +19,10 @@
 #ifndef META_INHIBIT_SHORTCUTS_DIALOG_DEFAULT_H
 #define META_INHIBIT_SHORTCUTS_DIALOG_DEFAULT_H
 
+#include <glib-object.h>
+
+#include "meta/meta-plugin.h"
+
 #define META_TYPE_INHIBIT_SHORTCUTS_DIALOG_DEFAULT (meta_inhibit_shortcuts_dialog_default_get_type ())
 G_DECLARE_FINAL_TYPE (MetaInhibitShortcutsDialogDefault,
                       meta_inhibit_shortcuts_dialog_default,

src/core/meta-inhibit-shortcuts-dialog-default.c

@@ -18,12 +18,12 @@
  *
  */
 
-#include <config.h>
+#include "config.h"
 
-#include "util-private.h"
-#include "window-private.h"
+#include "core/meta-inhibit-shortcuts-dialog-default-private.h"
+#include "core/util-private.h"
+#include "core/window-private.h"
 #include "meta/meta-inhibit-shortcuts-dialog.h"
-#include "meta-inhibit-shortcuts-dialog-default-private.h"
 
 typedef struct _MetaInhibitShortcutsDialogDefaultPrivate MetaInhibitShortcutsDialogDefaultPrivate;
 

src/core/meta-workspace-manager.c

@@ -30,7 +30,6 @@
 
 #include "core/window-private.h"
 #include "core/workspace-private.h"
-
 #include "meta/meta-enum-types.h"
 #include "meta/prefs.h"
 #include "meta/util.h"

src/core/mutter.c

@@ -19,14 +19,13 @@
 
 #include "config.h"
 
+#include <glib.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 
-#include <meta/main.h>
-#include <meta/util.h>
-#include <glib/gi18n-lib.h>
-#include "meta-plugin-manager.h"
-
-#include <glib.h>
+#include "compositor/meta-plugin-manager.h"
+#include "meta/main.h"
+#include "meta/util.h"
 
 static gboolean
 print_version (const gchar    *option_name,

src/core/place.c

@@ -22,19 +22,21 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "core/place.h"
 
-#include "boxes-private.h"
-#include "place.h"
-#include "backends/meta-backend-private.h"
-#include "backends/meta-logical-monitor.h"
-#include <meta/meta-backend.h>
-#include <meta/workspace.h>
-#include <meta/prefs.h>
 #include <gdk/gdk.h>
 #include <math.h>
 #include <stdlib.h>
 
+#include "backends/meta-backend-private.h"
+#include "backends/meta-logical-monitor.h"
+#include "core/boxes-private.h"
+#include "meta/meta-backend.h"
+#include "meta/prefs.h"
+#include "meta/workspace.h"
+
 typedef enum
 {
   META_LEFT,

src/core/place.h

@@ -22,8 +22,8 @@
 #ifndef META_PLACE_H
 #define META_PLACE_H
 
-#include "window-private.h"
-#include "frame.h"
+#include "core/frame.h"
+#include "core/window-private.h"
 
 void meta_window_process_placement (MetaWindow        *window,
                                     MetaPlacementRule *placement_rule,

src/core/prefs.c

@@ -26,16 +26,18 @@
  * @short_description: Mutter preferences
  */
 
-#include <config.h>
-#include <meta/prefs.h>
-#include "util-private.h"
-#include "meta-plugin-manager.h"
+#include "config.h"
+
 #include <glib.h>
 #include <gio/gio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "keybindings-private.h"
-#include "meta-accel-parse.h"
+
+#include "compositor/meta-plugin-manager.h"
+#include "core/keybindings-private.h"
+#include "core/meta-accel-parse.h"
+#include "core/util-private.h"
+#include "meta/prefs.h"
 #include "x11/meta-x11-display-private.h"
 
 /* If you add a key, it needs updating in init() and in the gsettings

src/core/restart-helper.c

@@ -27,6 +27,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <X11/Xlib.h>

src/core/restart.c

@@ -34,15 +34,15 @@
  * This handles both of these.
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <clutter/clutter.h>
 #include <gio/gunixinputstream.h>
 
-#include <meta/main.h>
-#include "ui.h"
-#include "util-private.h"
-#include "display-private.h"
+#include "clutter/clutter.h"
+#include "core/display-private.h"
+#include "core/util-private.h"
+#include "meta/main.h"
+#include "ui/ui.h"
 #include "x11/meta-x11-display-private.h"
 
 static gboolean restart_helper_started = FALSE;

src/core/stack-tracker.c

@@ -32,18 +32,17 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
+
+#include "core/stack-tracker.h"
 
 #include <string.h>
 
-#include "frame.h"
-#include "display-private.h"
-#include "stack-tracker.h"
-#include <meta/meta-x11-errors.h>
-#include <meta/util.h>
-
-#include <meta/compositor.h>
-
+#include "core/display-private.h"
+#include "core/frame.h"
+#include "meta/compositor.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/util.h"
 #include "x11/meta-x11-display-private.h"
 
 /* The complexity here comes from resolving two competing factors:

src/core/stack-tracker.h

@@ -34,8 +34,8 @@
 #ifndef META_STACK_TRACKER_H
 #define META_STACK_TRACKER_H
 
-#include <meta/display.h>
-#include <meta/window.h>
+#include "meta/display.h"
+#include "meta/window.h"
 
 typedef struct _MetaStackTracker MetaStackTracker;
 

src/core/stack.c

@@ -25,21 +25,22 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
-#include "stack.h"
-#include "meta-workspace-manager-private.h"
-#include "window-private.h"
-#include <meta/meta-x11-errors.h>
-#include "frame.h"
-#include <meta/group.h>
-#include <meta/prefs.h>
-#include <meta/workspace.h>
-#include "backends/meta-logical-monitor.h"
+#include "config.h"
+
+#include "core/stack.h"
 
 #include <X11/Xatom.h>
 
-#include "x11/meta-x11-display-private.h"
+#include "backends/meta-logical-monitor.h"
+#include "core/frame.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/window-private.h"
+#include "meta/group.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
+#include "meta/workspace.h"
 #include "x11/group-private.h"
+#include "x11/meta-x11-display-private.h"
 
 #define WINDOW_HAS_TRANSIENT_TYPE(w)                    \
           (w->type == META_WINDOW_DIALOG ||             \

src/core/stack.h

@@ -40,7 +40,7 @@
  * by layer, then by stack_position within each layer.
  */
 
-#include "display-private.h"
+#include "core/display-private.h"
 
 /**
  * A sorted list of windows bearing some level of resemblance to the stack of

src/core/startup-notification-private.h

@@ -25,7 +25,7 @@
 #ifndef META_STARTUP_NOTIFICATION_PRIVATE_H
 #define META_STARTUP_NOTIFICATION_PRIVATE_H
 
-#include "display-private.h"
+#include "core/display-private.h"
 
 #define META_TYPE_STARTUP_NOTIFICATION (meta_startup_notification_get_type ())
 

src/core/startup-notification.c

@@ -22,14 +22,14 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <glib-object.h>
 
-#include <meta/meta-x11-errors.h>
-#include "display-private.h"
+#include "core/display-private.h"
+#include "core/startup-notification-private.h"
+#include "meta/meta-x11-errors.h"
 #include "x11/meta-x11-display-private.h"
-#include "startup-notification-private.h"
 
 /* This should be fairly long, as it should never be required unless
  * apps or .desktop files are buggy, and it's confusing if

src/core/util-private.h

@@ -25,9 +25,10 @@
 #ifndef META_UTIL_PRIVATE_H
 #define META_UTIL_PRIVATE_H
 
-#include <meta/util.h>
 #include <glib/gi18n-lib.h>
 
+#include "meta/util.h"
+
 void     meta_set_verbose (gboolean setting);
 void     meta_set_debugging (gboolean setting);
 void     meta_set_syncing (gboolean setting);

src/core/util.c

@@ -26,12 +26,9 @@
 
 #define _POSIX_C_SOURCE 200112L /* for fdopen() */
 
-#include <config.h>
-#include <meta/common.h>
-#include "util-private.h"
-#include <meta/main.h>
+#include "config.h"
 
-#include <clutter/clutter.h> /* For clutter_threads_add_repaint_func() */
+#include "core/util-private.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,6 +38,10 @@
 #include <X11/Xlib.h>   /* must explicitly be included for Solaris; #326746 */
 #include <X11/Xutil.h>  /* Just for the definition of the various gravities */
 
+#include "clutter/clutter.h"
+#include "meta/common.h"
+#include "meta/main.h"
+
 #ifdef WITH_VERBOSE_MODE
 static void
 meta_topic_real_valist (MetaDebugTopic topic,

src/core/window-private.h

@@ -32,21 +32,19 @@
 #ifndef META_WINDOW_PRIVATE_H
 #define META_WINDOW_PRIVATE_H
 
-#include <config.h>
-#include <meta/compositor.h>
-#include <meta/window.h>
-#include <meta/meta-close-dialog.h>
-#include "backends/meta-logical-monitor.h"
-#include <meta/util.h>
-#include "stack.h"
 #include <X11/Xutil.h>
 #include <cairo.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <clutter/clutter.h>
-
-#include "x11/group-private.h"
 
+#include "backends/meta-logical-monitor.h"
+#include "clutter/clutter.h"
+#include "core/stack.h"
+#include "meta/compositor.h"
+#include "meta/meta-close-dialog.h"
+#include "meta/util.h"
+#include "meta/window.h"
 #include "wayland/meta-wayland-types.h"
+#include "x11/group-private.h"
 
 typedef struct _MetaWindowQueue MetaWindowQueue;
 

src/core/window.c

@@ -26,47 +26,46 @@
  * @short_description: Mutter X managed windows
  */
 
-#include <config.h>
-#include "window-private.h"
-#include "boxes-private.h"
-#include "edge-resistance.h"
-#include "util-private.h"
-#include "frame.h"
-#include <meta/meta-x11-errors.h>
-#include "meta-workspace-manager-private.h"
-#include "workspace-private.h"
-#include "stack.h"
-#include "keybindings-private.h"
-#include "ui.h"
-#include "place.h"
-#include <meta/prefs.h>
-#include <meta/group.h>
-#include "constraints.h"
-#include <meta/meta-enum-types.h>
-#include "core.h"
+#include "config.h"
 
-#include <X11/Xatom.h>
+#include "core/window-private.h"
+
+#include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#include <math.h>
-
-#include <meta/meta-cursor-tracker.h>
-#include "meta/compositor-mutter.h"
-
-#include "x11/meta-x11-display-private.h"
-#include "x11/window-x11.h"
-#include "x11/window-props.h"
-#include "x11/xprops.h"
-
-#ifdef HAVE_WAYLAND
-#include "wayland/meta-window-wayland.h"
-#include "wayland/meta-window-xwayland.h"
-#include "wayland/meta-wayland-surface.h"
-#include "wayland/meta-wayland-private.h"
-#endif
+#include <X11/Xatom.h>
 
 #include "backends/meta-backend-private.h"
 #include "backends/meta-logical-monitor.h"
+#include "core/boxes-private.h"
+#include "core/constraints.h"
+#include "core/core.h"
+#include "core/edge-resistance.h"
+#include "core/frame.h"
+#include "core/keybindings-private.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/place.h"
+#include "core/stack.h"
+#include "core/util-private.h"
+#include "core/workspace-private.h"
+#include "meta/compositor-mutter.h"
+#include "meta/group.h"
+#include "meta/meta-cursor-tracker.h"
+#include "meta/meta-enum-types.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
+#include "ui/ui.h"
+#include "x11/meta-x11-display-private.h"
+#include "x11/window-props.h"
+#include "x11/window-x11.h"
+#include "x11/xprops.h"
+
+#ifdef HAVE_WAYLAND
+#include "wayland/meta-wayland-private.h"
+#include "wayland/meta-wayland-surface.h"
+#include "wayland/meta-window-wayland.h"
+#include "wayland/meta-window-xwayland.h"
+#endif
 
 /* Windows that unmaximize to a size bigger than that fraction of the workarea
  * will be scaled down to that size (while maintaining aspect ratio).

src/core/workspace-private.h

@@ -31,8 +31,8 @@
 #ifndef META_WORKSPACE_PRIVATE_H
 #define META_WORKSPACE_PRIVATE_H
 
-#include <meta/workspace.h>
-#include "window-private.h"
+#include "core/window-private.h"
+#include "meta/workspace.h"
 
 struct _MetaWorkspace
 {

src/core/workspace.c

@@ -31,18 +31,9 @@
  * are unmapped.
  */
 
-#include <config.h>
-#include "backends/meta-backend-private.h"
-#include "backends/meta-logical-monitor.h"
-#include "x11/meta-x11-display-private.h"
-#include <meta/workspace.h>
-#include "meta-workspace-manager-private.h"
-#include "workspace-private.h"
-#include "boxes-private.h"
-#include <meta/meta-x11-errors.h>
-#include <meta/prefs.h>
+#include "config.h"
 
-#include <meta/compositor.h>
+#include "meta/workspace.h"
 
 #include <X11/Xatom.h>
 #include <string.h>
@@ -50,6 +41,16 @@
 #include <canberra-gtk.h>
 #endif
 
+#include "backends/meta-backend-private.h"
+#include "backends/meta-logical-monitor.h"
+#include "core/boxes-private.h"
+#include "core/meta-workspace-manager-private.h"
+#include "core/workspace-private.h"
+#include "meta/compositor.h"
+#include "meta/meta-x11-errors.h"
+#include "meta/prefs.h"
+#include "x11/meta-x11-display-private.h"
+
 void meta_workspace_queue_calc_showing   (MetaWorkspace *workspace);
 static void focus_ancestor_or_top_window (MetaWorkspace *workspace,
                                           MetaWindow    *not_this_one,