diff --git a/common/common-external.c b/common/common-external.c
index 12f30fb..384fe92 100644
--- a/common/common-external.c
+++ b/common/common-external.c
@@ -34,10 +34,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-external.h"
 #include "common-logging.h"
 
-#include <linux/limits.h>
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/common/common-governors.c b/common/common-governors.c
index eb5e27f..56a03ba 100644
--- a/common/common-governors.c
+++ b/common/common-governors.c
@@ -36,8 +36,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <assert.h>
 #include <glob.h>
-#include <stdio.h>
-#include <string.h>
 
 /**
  * Discover all governers on the system.
diff --git a/common/common-gpu.c b/common/common-gpu.c
index 392a9d2..564b450 100644
--- a/common/common-gpu.c
+++ b/common/common-gpu.c
@@ -31,8 +31,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-gpu.h"
 #include "common-logging.h"
 
-#include <stdio.h>
-
 /* Get the vendor for a device */
 enum GPUVendor gamemode_get_gpu_vendor(long device)
 {
diff --git a/common/common-helpers.h b/common/common-helpers.h
index f8dfc1a..6af4ba2 100644
--- a/common/common-helpers.h
+++ b/common/common-helpers.h
@@ -31,7 +31,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #pragma once
 
-#include <stdio.h>
 #include <string.h>
 #include <sys/param.h>
 #include <unistd.h>
diff --git a/common/common-logging.h b/common/common-logging.h
index 72ac387..2af940a 100644
--- a/common/common-logging.h
+++ b/common/common-logging.h
@@ -37,7 +37,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <unistd.h>
 
 /* Macros to help with basic logging */
 #define PLOG_MSG(...) printf(__VA_ARGS__)
diff --git a/daemon/gamemode-config.c b/daemon/gamemode-config.c
index b482d02..6b8f5d9 100644
--- a/daemon/gamemode-config.c
+++ b/daemon/gamemode-config.c
@@ -39,14 +39,10 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "ini.h"
 
 #include <dirent.h>
-#include <linux/limits.h>
 #include <pthread.h>
 #include <pwd.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/inotify.h>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 /* Name and possible location of the config file */
 #define CONFIG_NAME "gamemode.ini"
diff --git a/daemon/gamemode-context.c b/daemon/gamemode-context.c
index 0cd1b05..f038f61 100644
--- a/daemon/gamemode-context.c
+++ b/daemon/gamemode-context.c
@@ -35,6 +35,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-governors.h"
 #include "common-helpers.h"
 #include "common-logging.h"
+
 #include "gamemode-config.h"
 #include "gamemode.h"
 
@@ -42,11 +43,8 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <fcntl.h>
 #include <pthread.h>
-#include <signal.h>
 #include <stdatomic.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <systemd/sd-daemon.h>
+#include <systemd/sd-daemon.h> /* TODO: Move usage to gamemode-dbus.c */
 #include <unistd.h>
 
 /**
diff --git a/daemon/gamemode-dbus.c b/daemon/gamemode-dbus.c
index 8f1eea9..1bf22c7 100644
--- a/daemon/gamemode-dbus.c
+++ b/daemon/gamemode-dbus.c
@@ -34,8 +34,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-logging.h"
 #include "gamemode.h"
 
-#include <stdlib.h>
-
 #include <systemd/sd-bus.h>
 #include <systemd/sd-daemon.h>
 
diff --git a/daemon/gamemode-gpu.c b/daemon/gamemode-gpu.c
index 26d9f5b..5debbf5 100644
--- a/daemon/gamemode-gpu.c
+++ b/daemon/gamemode-gpu.c
@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-gpu.h"
 #include "common-helpers.h"
 #include "common-logging.h"
+
 #include "gamemode-config.h"
 #include "gamemode.h"
 
diff --git a/daemon/gamemode-ioprio.c b/daemon/gamemode-ioprio.c
index 32eb40d..65709c0 100644
--- a/daemon/gamemode-ioprio.c
+++ b/daemon/gamemode-ioprio.c
@@ -37,10 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "gamemode.h"
 
 #include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
 #include <sys/syscall.h>
-#include <unistd.h>
 
 /**
  * Define the syscall interface in Linux because it is missing from glibc
diff --git a/daemon/gamemode-sched.c b/daemon/gamemode-sched.c
index 06aa31a..30745b4 100644
--- a/daemon/gamemode-sched.c
+++ b/daemon/gamemode-sched.c
@@ -36,10 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "gamemode.h"
 
 #include <dirent.h>
-#include <errno.h>
 #include <sched.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/resource.h>
 #include <sys/sysinfo.h>
 
diff --git a/daemon/gamemode-tests.c b/daemon/gamemode-tests.c
index db7474e..8de10e8 100644
--- a/daemon/gamemode-tests.c
+++ b/daemon/gamemode-tests.c
@@ -36,16 +36,14 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-gpu.h"
 #include "common-helpers.h"
 #include "common-logging.h"
+
 #include "gamemode-config.h"
 #include "gamemode.h"
 #include "gamemode_client.h"
 
-#include <libgen.h>
 #include <pthread.h>
 #include <sys/syscall.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 struct GameModeConfig;
 
diff --git a/daemon/gamemode-wine.c b/daemon/gamemode-wine.c
index a50112b..4dd6278 100644
--- a/daemon/gamemode-wine.c
+++ b/daemon/gamemode-wine.c
@@ -37,12 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #include <ctype.h>
 #include <fcntl.h>
-#include <linux/limits.h>
 #include <pwd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 /**
  * Detect if the process is a wine preloader process
diff --git a/daemon/gamemode.h b/daemon/gamemode.h
index 434d657..6a5a5cf 100644
--- a/daemon/gamemode.h
+++ b/daemon/gamemode.h
@@ -32,7 +32,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #pragma once
 
 #include <stdbool.h>
-#include <sys/types.h>
 
 #define INVALID_PROCFD -1
 
diff --git a/daemon/gamemoded.c b/daemon/gamemoded.c
index 1401652..26a4f31 100644
--- a/daemon/gamemoded.c
+++ b/daemon/gamemoded.c
@@ -60,11 +60,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <fcntl.h>
 #include <getopt.h>
 #include <signal.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <systemd/sd-daemon.h>
+#include <systemd/sd-daemon.h> /* TODO: Move usage to gamemode-dbus.c */
 #include <unistd.h>
 
 #define USAGE_TEXT                                                                                 \
diff --git a/lib/client_impl.c b/lib/client_impl.c
index 66bdeab..6be1c01 100644
--- a/lib/client_impl.c
+++ b/lib/client_impl.c
@@ -32,11 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define _GNU_SOURCE
 
 #include <dbus/dbus.h>
-#include <dlfcn.h>
-#include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/util/cpugovctl.c b/util/cpugovctl.c
index adf275a..efe266d 100644
--- a/util/cpugovctl.c
+++ b/util/cpugovctl.c
@@ -34,9 +34,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-governors.h"
 #include "common-logging.h"
 
-#include <ctype.h>
-#include <errno.h>
-#include <sys/types.h>
+#include <unistd.h>
 
 /**
  * Sets all governors to a value
diff --git a/util/gpuclockctl.c b/util/gpuclockctl.c
index 6fa7e2b..438cc76 100644
--- a/util/gpuclockctl.c
+++ b/util/gpuclockctl.c
@@ -36,6 +36,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "common-logging.h"
 
 #include <limits.h>
+#include <unistd.h>
 
 /* NV constants */
 #define NV_CORE_OFFSET_ATTRIBUTE "GPUGraphicsClockOffset"