summaryrefslogtreecommitdiff
path: root/src/backends/meta-monitor-manager.c
diff options
context:
space:
mode:
authorJonas Ådahl <jadahl@gmail.com>2018-07-10 10:36:24 +0200
committerJonas Ådahl <jadahl@gmail.com>2018-11-06 17:17:36 +0100
commit2f4a68c8c3690663c7f0dbdd7aaa55ee9963a231 (patch)
treeb2dbb261e756f8b7a3c5e0ba2241546fe05901c0 /src/backends/meta-monitor-manager.c
parent92f4ffc0dd66faa77a96e130562b77c716e26f3b (diff)
downloadmutter-2f4a68c8c3690663c7f0dbdd7aaa55ee9963a231.tar.gz
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.
Diffstat (limited to 'src/backends/meta-monitor-manager.c')
-rw-r--r--src/backends/meta-monitor-manager.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index baed7521d..a411055fc 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/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