diff --git a/lib/cfg.c b/lib/cfg.c
index d2781631e..4584bc1a9 100644
--- a/lib/cfg.c
+++ b/lib/cfg.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <libgen.h>
-#include <dlfcn.h>
 #include <unistd.h>
 
 #include "utils.h"
diff --git a/lib/kernel/if.c b/lib/kernel/if.c
index 767831992..60c0af1ff 100644
--- a/lib/kernel/if.c
+++ b/lib/kernel/if.c
@@ -8,13 +8,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <dirent.h>
-#include <arpa/inet.h>
 #include <linux/if_packet.h>
 
 #include <netlink/route/link.h>
-#include <netlink/route/route.h>
 
 #include "kernel/if.h"
 #include "kernel/tc.h"
diff --git a/lib/kernel/pci.c b/lib/kernel/pci.c
index 7ed1ba71c..bdd388f44 100644
--- a/lib/kernel/pci.c
+++ b/lib/kernel/pci.c
@@ -7,7 +7,6 @@
  **********************************************************************************/
 
 #include <dirent.h>
-#include <unistd.h>
 #include <libgen.h>
 #include <string.h>
 
diff --git a/lib/kernel/rt.c b/lib/kernel/rt.c
index e8cac2b08..1c801abd1 100644
--- a/lib/kernel/rt.c
+++ b/lib/kernel/rt.c
@@ -7,7 +7,9 @@
  *********************************************************************************/
 
 #include <sched.h>
+#include <unistd.h>
 
+#include "config.h"
 #include "utils.h"
 #include "cfg.h"
 
diff --git a/lib/kernel/vfio.c b/lib/kernel/vfio.c
index c8915fd21..d5fb7f9a7 100644
--- a/lib/kernel/vfio.c
+++ b/lib/kernel/vfio.c
@@ -12,10 +12,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <string.h>
 
-#include <sys/ioctl.h>
 #include <sys/eventfd.h>
 
 #include "utils.h"
diff --git a/lib/msg.c b/lib/msg.c
index 70b277d31..7083307e5 100644
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -6,10 +6,6 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  *********************************************************************************/
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
 #ifdef __linux__
   #include <byteswap.h>
 #elif defined(__PPC__) /* Xilinx toolchain */
diff --git a/lib/nodes/fpga.c b/lib/nodes/fpga.c
index a7c65ff1d..0c71f3070 100644
--- a/lib/nodes/fpga.c
+++ b/lib/nodes/fpga.c
@@ -8,9 +8,6 @@
 
 #include <stdio.h>
 #include <inttypes.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/mman.h>
 
 #include "kernel/kernel.h"
 #include "kernel/pci.h"
diff --git a/lib/nodes/ngsi.c b/lib/nodes/ngsi.c
index 3aebd0368..e50b1c25c 100644
--- a/lib/nodes/ngsi.c
+++ b/lib/nodes/ngsi.c
@@ -11,7 +11,6 @@
 
 #include <curl/curl.h>
 #include <jansson.h>
-#include <math.h>
 #include <pthread.h>
 #include <unistd.h>
 
diff --git a/lib/nodes/socket.c b/lib/nodes/socket.c
index 48bffbc3e..707aa220b 100644
--- a/lib/nodes/socket.c
+++ b/lib/nodes/socket.c
@@ -6,18 +6,9 @@
  *   Unauthorized copying of this file, via any medium is strictly prohibited.
  *********************************************************************************/
 
-#include <string.h>
 #include <unistd.h>
-
-#include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <sys/un.h>
-
-#include <netinet/ether.h>
 #include <netinet/ip.h>
-#include <linux/if_packet.h>
-#include <arpa/inet.h>
 
 #ifdef __linux__
   #include <byteswap.h>
diff --git a/src/fpga.c b/src/fpga.c
index 46895c0f6..5492b5d6a 100644
--- a/src/fpga.c
+++ b/src/fpga.c
@@ -8,11 +8,8 @@
  
 #include <stdlib.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
-#include <errno.h>
 #include <getopt.h>
-#include <sched.h>
 
 #include <villas/log.h>
 #include <villas/cfg.h>
diff --git a/src/node.c b/src/node.c
index b4cf53cd7..6dbac04e8 100644
--- a/src/node.c
+++ b/src/node.c
@@ -7,10 +7,8 @@
  *********************************************************************************/
 
 #include <stdlib.h>
-#include <string.h>
 #include <signal.h>
 #include <unistd.h>
-#include <sched.h>
 
 #include "config.h"
 
diff --git a/src/pipe.c b/src/pipe.c
index 75ca559e9..465a915e3 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <unistd.h>
-#include <string.h>
 #include <signal.h>
 #include <pthread.h>
 
diff --git a/tests/advio.c b/tests/advio.c
index 3f3900a79..e3a63e6c6 100644
--- a/tests/advio.c
+++ b/tests/advio.c
@@ -5,7 +5,6 @@
 #include <villas/advio.h>
 
 #include <errno.h>
-#include <error.h>
 
 Test(advio, download)
 {