5 files changed, 20 insertions, 27 deletions
diff --git a/common/drm.c b/common/drm.c
index 684a925..8be2c62 100644
--- a/common/drm.c
+++ b/common/drm.c
@@ -6,7 +6,6 @@
 #include <sys/sysmacros.h>
 #endif
 
-#include "compiler.h"
 #include "drm.h"
 
 // From libdrm
@@ -15,6 +14,8 @@
 #define DRM_IOCTL_SET_MASTER  DRM_IO(0x1e)
 #define DRM_IOCTL_DROP_MASTER DRM_IO(0x1f)
 
+#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
+
 int drm_set_master(int fd) {
 	return ioctl(fd, DRM_IOCTL_SET_MASTER, 0);
 }
diff --git a/common/evdev.c b/common/evdev.c
index 69c368d..4aff9bc 100644
--- a/common/evdev.c
+++ b/common/evdev.c
@@ -13,9 +13,10 @@
 #error Unsupported platform
 #endif
 
-#include "compiler.h"
 #include "evdev.h"
 
+#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
+
 int path_is_evdev(const char *path) {
 	static const char prefix[] = "/dev/input/event";
 	static const size_t prefixlen = STRLEN(prefix);
diff --git a/include/compiler.h b/include/compiler.h
deleted file mode 100644
index 35cc061..0000000
--- a/include/compiler.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _COMPILER_H
-#define _COMPILER_H
-
-#ifdef __GNUC__
-#define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end)))
-#else
-#define ATTRIB_PRINTF(start, end)
-#endif
-
-#define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
-
-#endif
diff --git a/include/log.h b/include/log.h
index e916446..7b6e9a4 100644
--- a/include/log.h
+++ b/include/log.h
@@ -1,20 +1,13 @@
 #ifndef _LOG_H
 #define _LOG_H
 
-#include "compiler.h"
 #include <stdarg.h>
 
-enum libseat_log_level {
-	LIBSEAT_SILENT = 0,
-	LIBSEAT_ERROR = 1,
-	LIBSEAT_INFO = 2,
-	LIBSEAT_DEBUG = 3,
-	LIBSEAT_LOG_LEVEL_LAST,
-};
-
-void libseat_log_init(enum libseat_log_level level);
-
-void _libseat_logf(enum libseat_log_level level, const char *fmt, ...) ATTRIB_PRINTF(2, 3);
+#ifdef __GNUC__
+#define ATTRIB_PRINTF(start, end) __attribute__((format(printf, start, end)))
+#else
+#define ATTRIB_PRINTF(start, end)
+#endif
 
 #ifdef LIBSEAT_REL_SRC_DIR
 #define _LIBSEAT_FILENAME ((const char *)__FILE__ + sizeof(LIBSEAT_REL_SRC_DIR) - 1)
@@ -48,4 +41,15 @@ void _libseat_logf(enum libseat_log_level level, const char *fmt, ...) ATTRIB_PR
 #define log_debug(str)
 #endif
 
+enum libseat_log_level {
+	LIBSEAT_SILENT = 0,
+	LIBSEAT_ERROR = 1,
+	LIBSEAT_INFO = 2,
+	LIBSEAT_DEBUG = 3,
+	LIBSEAT_LOG_LEVEL_LAST,
+};
+
+void libseat_log_init(enum libseat_log_level level);
+void _libseat_logf(enum libseat_log_level level, const char *fmt, ...) ATTRIB_PRINTF(2, 3);
+
 #endif
diff --git a/libseat/libseat.c b/libseat/libseat.c
index 00168c0..175f284 100644
--- a/libseat/libseat.c
+++ b/libseat/libseat.c
@@ -7,7 +7,6 @@
 #include <string.h>
 
 #include "backend.h"
-#include "compiler.h"
 #include "libseat.h"
 #include "log.h"