8 files changed, 23 insertions, 30 deletions
diff --git a/include/backend/drm.h b/include/backend/drm.h
index a4995fa9..2c78e3d9 100644
--- a/include/backend/drm.h
+++ b/include/backend/drm.h
@@ -11,8 +11,8 @@
 #include <gbm.h>
 
 #include <wlr/session.h>
-#include <wlr/common/list.h>
 #include <wlr/backend/drm.h>
+#include <wlr/util/list.h>
 
 #include "backend/egl.h"
 #include "backend/udev.h"
diff --git a/include/backend/libinput.h b/include/backend/libinput.h
index f424053a..bb83c749 100644
--- a/include/backend/libinput.h
+++ b/include/backend/libinput.h
@@ -1,10 +1,10 @@
 #ifndef _WLR_BACKEND_LIBINPUT_INTERNAL_H
 #define _WLR_BACKEND_LIBINPUT_INTERNAL_H
 #include <libinput.h>
-#include <wlr/backend/interface.h>
-#include <wlr/common/list.h>
 #include <wayland-server-core.h>
+#include <wlr/backend/interface.h>
 #include <wlr/interfaces/wlr_input_device.h>
+#include <wlr/util/list.h>
 #include "backend/udev.h"
 
 struct wlr_backend_state {
diff --git a/include/backend/multi.h b/include/backend/multi.h
index 5e6930bb..efaf61b9 100644
--- a/include/backend/multi.h
+++ b/include/backend/multi.h
@@ -3,7 +3,7 @@
 
 #include <wlr/backend/interface.h>
 #include <wlr/backend/multi.h>
-#include <wlr/common/list.h>
+#include <wlr/util/list.h>
 
 struct wlr_backend_state {
 	struct wlr_backend *backend;
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index 02ea3482..bf65ec50 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -4,9 +4,9 @@
 #include <wayland-client.h>
 #include <wayland-server.h>
 #include <wayland-egl.h>
-#include <wlr/common/list.h>
 #include <wlr/backend/wayland.h>
 #include <wlr/types/wlr_input_device.h>
+#include <wlr/util/list.h>
 #include "backend/egl.h"
 
 struct wlr_backend_state {
diff --git a/include/wlr/common/log.h b/include/wlr/common/log.h
deleted file mode 100644
index c93f9652..00000000
--- a/include/wlr/common/log.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _WLR_COMMON_LOG_H
-#define _WLR_COMMON_LOG_H
-#include <stdbool.h>
-#include <stdarg.h>
-
-typedef enum {
-	L_SILENT = 0,
-	L_ERROR = 1,
-	L_INFO = 2,
-	L_DEBUG = 3,
-	L_LAST,
-} log_importance_t;
-
-typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args);
-
-void wlr_init_log(log_callback_t callback);
-void wlr_log_stderr(log_importance_t verbosity, const char *fmt, va_list args);
-
-#endif
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index 66216d3e..8ccf87e1 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -1,7 +1,7 @@
 #ifndef _WLR_TYPES_OUTPUT_H
 #define _WLR_TYPES_OUTPUT_H
 #include <wayland-server.h>
-#include <wlr/common/list.h>
+#include <wlr/util/list.h>
 #include <stdbool.h>
 
 struct wlr_output_mode_state;
diff --git a/include/wlr/common/list.h b/include/wlr/util/list.h
index 2bc82570..c82fbf7a 100644
--- a/include/wlr/common/list.h
+++ b/include/wlr/util/list.h
@@ -1,5 +1,5 @@
-#ifndef _WLR_LIST_H
-#define _WLR_LIST_H
+#ifndef _WLR_UTIL_LIST_H
+#define _WLR_UTIL_LIST_H
 
 #include <stddef.h>
 
diff --git a/include/common/log.h b/include/wlr/util/log.h
index 98e57900..2acaa2ed 100644
--- a/include/common/log.h
+++ b/include/wlr/util/log.h
@@ -1,9 +1,21 @@
-#ifndef _WLR_INTERNAL_COMMON_LOG_H
-#define _WLR_INTERNAL_COMMON_LOG_H
+#ifndef _WLR_UTIL_LOG_H
+#define _WLR_UTIL_LOG_H
 #include <stdbool.h>
+#include <stdarg.h>
 #include <string.h>
 #include <errno.h>
-#include <wlr/common/log.h>
+
+typedef enum {
+	L_SILENT = 0,
+	L_ERROR = 1,
+	L_INFO = 2,
+	L_DEBUG = 3,
+	L_LAST,
+} log_importance_t;
+
+typedef void (*log_callback_t)(log_importance_t importance, const char *fmt, va_list args);
+
+void wlr_init_log(log_callback_t callback);
 
 #ifdef __GNUC__
 #define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end)))