Reorganize wlr-common

7 files changed, 8 insertions, 13 deletions

diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index fedab148..a3523dc0 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -3,9 +3,9 @@
 #include <libinput.h>
 #include <wlr/session.h>
 #include <wlr/backend/interface.h>
+#include <wlr/util/log.h>
 #include "backend/udev.h"
 #include "backend/libinput.h"
-#include "common/log.h"
 
 static int wlr_libinput_open_restricted(const char *path,
 		int flags, void *_state) {
diff --git a/backend/libinput/events.c b/backend/libinput/events.c
index 1f8f51c7..6cd33e3d 100644
--- a/backend/libinput/events.c
+++ b/backend/libinput/events.c
@@ -2,10 +2,10 @@
 #include <assert.h>
 #include <libinput.h>
 #include <wlr/session.h>
-#include <wlr/common/list.h>
 #include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/util/list.h>
+#include <wlr/util/log.h>
 #include "backend/libinput.h"
-#include "common/log.h"
 
 struct wlr_input_device *get_appropriate_device(
 		enum wlr_input_device_type desired_type,
diff --git a/backend/libinput/keyboard.c b/backend/libinput/keyboard.c
index 26d4309c..f188b09e 100644
--- a/backend/libinput/keyboard.c
+++ b/backend/libinput/keyboard.c
@@ -4,9 +4,8 @@
 #include <wlr/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_keyboard.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
 #include "backend/libinput.h"
-#include "common/log.h"
 
 struct wlr_keyboard_state {
 	struct libinput_device *device;
diff --git a/backend/libinput/pointer.c b/backend/libinput/pointer.c
index d4d3aec0..436c826a 100644
--- a/backend/libinput/pointer.c
+++ b/backend/libinput/pointer.c
@@ -4,9 +4,8 @@
 #include <wlr/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_pointer.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
 #include "backend/libinput.h"
-#include "common/log.h"
 
 struct wlr_pointer *wlr_libinput_pointer_create(
 		struct libinput_device *device) {
diff --git a/backend/libinput/tablet_pad.c b/backend/libinput/tablet_pad.c
index 3c34b643..fdb4775e 100644
--- a/backend/libinput/tablet_pad.c
+++ b/backend/libinput/tablet_pad.c
@@ -4,9 +4,8 @@
 #include <wlr/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_tablet_pad.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
 #include "backend/libinput.h"
-#include "common/log.h"
 
 struct wlr_tablet_pad *wlr_libinput_tablet_pad_create(
 		struct libinput_device *device) {
diff --git a/backend/libinput/tablet_tool.c b/backend/libinput/tablet_tool.c
index 8cf2933b..e9e2951f 100644
--- a/backend/libinput/tablet_tool.c
+++ b/backend/libinput/tablet_tool.c
@@ -4,9 +4,8 @@
 #include <wlr/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_tablet_tool.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
 #include "backend/libinput.h"
-#include "common/log.h"
 
 struct wlr_tablet_tool *wlr_libinput_tablet_tool_create(
 		struct libinput_device *device) {
diff --git a/backend/libinput/touch.c b/backend/libinput/touch.c
index d0048ff0..b19597a3 100644
--- a/backend/libinput/touch.c
+++ b/backend/libinput/touch.c
@@ -4,9 +4,8 @@
 #include <wlr/session.h>
 #include <wlr/types/wlr_input_device.h>
 #include <wlr/interfaces/wlr_touch.h>
-#include <wlr/common/list.h>
+#include <wlr/util/log.h>
 #include "backend/libinput.h"
-#include "common/log.h"
 
 struct wlr_touch *wlr_libinput_touch_create(
 		struct libinput_device *device) {