diff --git a/src/builddir.h b/src/builddir.h
index 7fc377c6..bc0c9e54 100644
--- a/src/builddir.h
+++ b/src/builddir.h
@@ -25,6 +25,9 @@
 
 #pragma once
 
+#include <unistd.h>
+#include "util-strings.h"
+
 /**
  * Try to figure out the directory we're executing from and if it matches
  * the builddir, return that directory. Otherwise, return NULL.
diff --git a/src/util-list.h b/src/util-list.h
index 25642319..292665a8 100644
--- a/src/util-list.h
+++ b/src/util-list.h
@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <stdbool.h>
+#include <stddef.h>
 
 /*
  * This list data structure is a verbatim copy from wayland-util.h from the
diff --git a/tools/libinput-debug-gui.c b/tools/libinput-debug-gui.c
index 629a5cf6..ea31e178 100644
--- a/tools/libinput-debug-gui.c
+++ b/tools/libinput-debug-gui.c
@@ -24,6 +24,7 @@
 
 #include <linux/input.h>
 
+#include <assert.h>
 #include <cairo.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -41,7 +42,9 @@
 #include <libevdev/libevdev.h>
 
 #include <libinput.h>
-#include <libinput-util.h>
+#include "util-strings.h"
+#include "util-macros.h"
+#include "util-list.h"
 
 #include "shared.h"
 
diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c
index 4b06452e..29f80ce1 100644
--- a/tools/libinput-list-devices.c
+++ b/tools/libinput-list-devices.c
@@ -31,8 +31,8 @@
 #include <libudev.h>
 
 #include <libinput.h>
-#include <libinput-util.h>
 #include <libinput-version.h>
+#include "util-strings.h"
 
 #include "shared.h"
 
diff --git a/tools/libinput-measure.c b/tools/libinput-measure.c
index fb9729c7..0c65a369 100644
--- a/tools/libinput-measure.c
+++ b/tools/libinput-measure.c
@@ -31,8 +31,6 @@
 #include <unistd.h>
 #include <libudev.h>
 
-#include <libinput-util.h>
-
 #include "shared.h"
 
 static inline void
diff --git a/tools/libinput-quirks.c b/tools/libinput-quirks.c
index 05796325..1a80f367 100644
--- a/tools/libinput-quirks.c
+++ b/tools/libinput-quirks.c
@@ -29,7 +29,6 @@
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include "libinput-util.h"
 #include "quirks.h"
 #include "shared.h"
 #include "builddir.h"
diff --git a/tools/libinput-record.c b/tools/libinput-record.c
index 75fa2845..f0bfbf0a 100644
--- a/tools/libinput-record.c
+++ b/tools/libinput-record.c
@@ -39,13 +39,16 @@
 #include <unistd.h>
 #include <signal.h>
 #include <stdbool.h>
+#include <time.h>
 
 #include "libinput-versionsort.h"
-#include "libinput-util.h"
 #include "libinput-version.h"
 #include "libinput-git-version.h"
 #include "shared.h"
 #include "builddir.h"
+#include "util-list.h"
+#include "util-time.h"
+#include "util-macros.h"
 
 static const int FILE_VERSION_NUMBER = 1;
 
diff --git a/tools/libinput-tool.c b/tools/libinput-tool.c
index 7195de04..3dc2f526 100644
--- a/tools/libinput-tool.c
+++ b/tools/libinput-tool.c
@@ -32,10 +32,10 @@
 #include <libudev.h>
 
 #include <libinput.h>
-#include <libinput-util.h>
 #include <libinput-version.h>
 
 #include "shared.h"
+
 static void
 usage(void)
 {
diff --git a/tools/shared.c b/tools/shared.c
index 02c09dd9..8541c595 100644
--- a/tools/shared.c
+++ b/tools/shared.c
@@ -23,21 +23,25 @@
 
 #include <config.h>
 
+#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <fnmatch.h>
 #include <getopt.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <libudev.h>
+#include <unistd.h>
 
 #include <libevdev/libevdev.h>
-#include <libinput-util.h>
 
 #include "builddir.h"
 #include "shared.h"
+#include "util-macros.h"
+#include "util-strings.h"
 
 LIBINPUT_ATTRIBUTE_PRINTF(3, 0)
 static void