6 files changed, 16 insertions, 16 deletions

diff --git a/backend/drm/backend.c b/backend/drm/backend.c
index c394ed65..e046cea6 100644
--- a/backend/drm/backend.c
+++ b/backend/drm/backend.c
@@ -12,7 +12,7 @@
 #include <wlr/util/list.h>
 #include <wlr/util/log.h>
 #include <wlr/egl.h>
-#include "backend/drm.h"
+#include "backend/drm/drm.h"
 
 static bool wlr_drm_backend_start(struct wlr_backend *_backend) {
 	struct wlr_drm_backend *backend = (struct wlr_drm_backend *)_backend;
diff --git a/backend/drm/drm.c b/backend/drm/drm.c
index 1a656172..cba41023 100644
--- a/backend/drm/drm.c
+++ b/backend/drm/drm.c
@@ -20,12 +20,12 @@
 #include <wlr/render/matrix.h>
 #include <wlr/render/gles2.h>
 #include <wlr/render.h>
-#include "backend/drm.h"
-#include "backend/drm-util.h"
+#include "backend/drm/drm.h"
+#include "backend/drm/util.h"
 
 bool wlr_drm_check_features(struct wlr_drm_backend *backend) {
-	extern const struct wlr_drm_interface legacy_iface;
-	extern const struct wlr_drm_interface atomic_iface;
+	extern const struct wlr_drm_interface iface_legacy;
+	extern const struct wlr_drm_interface iface_atomic;
 
 	if (drmSetClientCap(backend->fd, DRM_CLIENT_CAP_UNIVERSAL_PLANES, 1)) {
 		wlr_log(L_ERROR, "DRM universal planes unsupported");
@@ -34,13 +34,13 @@ bool wlr_drm_check_features(struct wlr_drm_backend *backend) {
 
 	if (getenv("WLR_DRM_NO_ATOMIC")) {
 		wlr_log(L_DEBUG, "WLR_DRM_NO_ATOMIC set, forcing legacy DRM interface");
-		backend->iface = &legacy_iface;
+		backend->iface = &iface_legacy;
 	} else if (drmSetClientCap(backend->fd, DRM_CLIENT_CAP_ATOMIC, 1)) {
 		wlr_log(L_DEBUG, "Atomic modesetting unsupported, using legacy DRM interface");
-		backend->iface = &legacy_iface;
+		backend->iface = &iface_legacy;
 	} else {
 		wlr_log(L_DEBUG, "Using atomic DRM interface");
-		backend->iface = &atomic_iface;
+		backend->iface = &iface_atomic;
 	}
 
 	return true;
diff --git a/backend/drm/drm-atomic.c b/backend/drm/iface_atomic.c
index 16c9c5c3..5bb2da9b 100644
--- a/backend/drm/drm-atomic.c
+++ b/backend/drm/iface_atomic.c
@@ -2,8 +2,8 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <wlr/util/log.h>
-#include "backend/drm.h"
-#include "backend/drm-util.h"
+#include "backend/drm/drm.h"
+#include "backend/drm/util.h"
 
 struct atomic {
 	drmModeAtomicReq *req;
@@ -180,7 +180,7 @@ static bool atomic_crtc_move_cursor(struct wlr_drm_backend *backend,
 	return atomic_end(backend->fd, &atom);
 }
 
-const struct wlr_drm_interface atomic_iface = {
+const struct wlr_drm_interface iface_atomic = {
 	.conn_enable = atomic_conn_enable,
 	.crtc_pageflip = atomic_crtc_pageflip,
 	.crtc_set_cursor = atomic_crtc_set_cursor,
diff --git a/backend/drm/drm-legacy.c b/backend/drm/iface_legacy.c
index 9b7cd301..856e9060 100644
--- a/backend/drm/drm-legacy.c
+++ b/backend/drm/iface_legacy.c
@@ -2,8 +2,8 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <wlr/util/log.h>
-#include "backend/drm.h"
-#include "backend/drm-util.h"
+#include "backend/drm/drm.h"
+#include "backend/drm/util.h"
 
 static bool legacy_crtc_pageflip(struct wlr_drm_backend *backend,
 		struct wlr_drm_output *output, struct wlr_drm_crtc *crtc,
@@ -57,7 +57,7 @@ bool legacy_crtc_move_cursor(struct wlr_drm_backend *backend,
 	return !drmModeMoveCursor(backend->fd, crtc->id, x, y);
 }
 
-const struct wlr_drm_interface legacy_iface = {
+const struct wlr_drm_interface iface_legacy = {
 	.conn_enable = legacy_conn_enable,
 	.crtc_pageflip = legacy_crtc_pageflip,
 	.crtc_set_cursor = legacy_crtc_set_cursor,
diff --git a/backend/drm/drm-properties.c b/backend/drm/properties.c
index ef24476f..5bec3243 100644
--- a/backend/drm/drm-properties.c
+++ b/backend/drm/properties.c
@@ -5,7 +5,7 @@
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 #include <wlr/util/log.h>
-#include "backend/drm-properties.h"
+#include "backend/drm/properties.h"
 
 /*
  * Creates a mapping between property names and an array index where to store
diff --git a/backend/drm/drm-util.c b/backend/drm/util.c
index 0f8ee18c..656c070a 100644
--- a/backend/drm/drm-util.c
+++ b/backend/drm/util.c
@@ -3,7 +3,7 @@
 #include <drm.h>
 #include <drm_mode.h>
 #include <gbm.h>
-#include "backend/drm-util.h"
+#include "backend/drm/util.h"
 #include <wlr/util/log.h>
 
 int32_t calculate_refresh_rate(drmModeModeInfo *mode) {