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/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
 {
@@ -157,17 +156,17 @@ constrain_all_screen_monitors (ClutterInputDevice *device,
       bottom = top + logical_monitor->rect.height;
 
       if ((cx >= left) && (cx < right) && (cy >= top) && (cy < bottom))
-	{
-	  if (*x < left)
-	    *x = left;
-	  if (*x >= right)
-	    *x = right - 1;
-	  if (*y < top)
-	    *y = top;
-	  if (*y >= bottom)
-	    *y = bottom - 1;
+        {
+          if (*x < left)
+            *x = left;
+          if (*x >= right)
+            *x = right - 1;
+          if (*y < top)
+            *y = top;
+          if (*y >= bottom)
+            *y = bottom - 1;
 
-	  return;
+          return;
         }
     }
 }
@@ -219,24 +218,24 @@ relative_motion_across_outputs (MetaMonitorManager *monitor_manager,
       MetaVector2 intersection;
 
       motion = (MetaLine2) {
-        .a = { x, y },
-        .b = { x + (dx * cur->scale), y + (dy * cur->scale) }
+          .a = { x, y },
+            .b = { x + (dx * cur->scale), y + (dy * cur->scale) }
       };
       left = (MetaLine2) {
-        { cur->rect.x, cur->rect.y },
-        { cur->rect.x, cur->rect.y + cur->rect.height }
+            { cur->rect.x, cur->rect.y },
+              { cur->rect.x, cur->rect.y + cur->rect.height }
       };
       right = (MetaLine2) {
-        { cur->rect.x + cur->rect.width, cur->rect.y },
-        { cur->rect.x + cur->rect.width, cur->rect.y + cur->rect.height }
+            { cur->rect.x + cur->rect.width, cur->rect.y },
+              { cur->rect.x + cur->rect.width, cur->rect.y + cur->rect.height }
       };
       top = (MetaLine2) {
-        { cur->rect.x, cur->rect.y },
-        { cur->rect.x + cur->rect.width, cur->rect.y }
+            { cur->rect.x, cur->rect.y },
+              { cur->rect.x + cur->rect.width, cur->rect.y }
       };
       bottom = (MetaLine2) {
-        { cur->rect.x, cur->rect.y + cur->rect.height },
-        { cur->rect.x + cur->rect.width, cur->rect.y + cur->rect.height }
+            { cur->rect.x, cur->rect.y + cur->rect.height },
+              { cur->rect.x + cur->rect.width, cur->rect.y + cur->rect.height }
       };
 
       if (direction != META_DISPLAY_RIGHT &&

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"