diff --git a/fpga/lib/dma.cpp b/fpga/lib/dma.cpp
index 5938d5b4b..0afebfdc2 100644
--- a/fpga/lib/dma.cpp
+++ b/fpga/lib/dma.cpp
@@ -7,9 +7,6 @@
 
 #include <villas/fpga/dma.h>
 
-#include <csignal>
-#include <iostream>
-#include <stdexcept>
 #include <string>
 
 #include <villas/exceptions.hpp>
diff --git a/fpga/lib/utils.cpp b/fpga/lib/utils.cpp
index 6963672cc..cc0d3986f 100644
--- a/fpga/lib/utils.cpp
+++ b/fpga/lib/utils.cpp
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <algorithm>
 #include <csignal>
 #include <filesystem>
 #include <iostream>
@@ -15,7 +14,6 @@
 #include <string>
 #include <vector>
 
-#include <CLI11.hpp>
 #include <rang.hpp>
 
 #include <villas/exceptions.hpp>
diff --git a/fpga/src/villas-fpga-ctrl.cpp b/fpga/src/villas-fpga-ctrl.cpp
index ad803a06e..b2363e401 100644
--- a/fpga/src/villas-fpga-ctrl.cpp
+++ b/fpga/src/villas-fpga-ctrl.cpp
@@ -8,7 +8,6 @@
  */
 
 #include <algorithm>
-#include <csignal>
 #include <iostream>
 #include <jansson.h>
 #include <string>
diff --git a/fpga/src/villas-fpga-pipe.cpp b/fpga/src/villas-fpga-pipe.cpp
index 0e8543e19..edb8ce9e5 100644
--- a/fpga/src/villas-fpga-pipe.cpp
+++ b/fpga/src/villas-fpga-pipe.cpp
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <algorithm>
-#include <csignal>
 #include <iostream>
 #include <jansson.h>
 #include <string>
diff --git a/lib/config_helper.cpp b/lib/config_helper.cpp
index 7e4da1b31..0c00c16a2 100644
--- a/lib/config_helper.cpp
+++ b/lib/config_helper.cpp
@@ -5,9 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <fstream>
-#include <iostream>
-
 #include <cstring>
 
 #include <villas/config_helper.hpp>
diff --git a/lib/formats/villas_human.cpp b/lib/formats/villas_human.cpp
index 73434be93..f92835f44 100644
--- a/lib/formats/villas_human.cpp
+++ b/lib/formats/villas_human.cpp
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <cassert>
 #include <cinttypes>
 #include <cstring>
 
diff --git a/lib/hooks/average.cpp b/lib/hooks/average.cpp
index 895cdf9ff..6ecd6d2f9 100644
--- a/lib/hooks/average.cpp
+++ b/lib/hooks/average.cpp
@@ -5,9 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <bitset>
-#include <cstring>
-
 #include <villas/hook.hpp>
 #include <villas/node/exceptions.hpp>
 #include <villas/sample.hpp>
diff --git a/lib/kernel/nl.cpp b/lib/kernel/nl.cpp
index 2f74dba95..9d317571f 100644
--- a/lib/kernel/nl.cpp
+++ b/lib/kernel/nl.cpp
@@ -7,8 +7,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <cstdio>
-
 #include <linux/if_packet.h>
 
 #include <netlink/route/link.h>
diff --git a/lib/memory/managed.cpp b/lib/memory/managed.cpp
index 50a27de09..8ffc1cdbf 100644
--- a/lib/memory/managed.cpp
+++ b/lib/memory/managed.cpp
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <cerrno>
 #include <cstdlib>
 #include <strings.h>
 #include <unistd.h>
diff --git a/lib/nodes/webrtc/peer_connection.cpp b/lib/nodes/webrtc/peer_connection.cpp
index edbba8a09..9e839cdf9 100644
--- a/lib/nodes/webrtc/peer_connection.cpp
+++ b/lib/nodes/webrtc/peer_connection.cpp
@@ -8,7 +8,6 @@
  */
 
 #include <chrono>
-#include <thread>
 
 #include <fmt/chrono.h>
 #include <fmt/core.h>
diff --git a/src/villas-compare.cpp b/src/villas-compare.cpp
index 09fa071b7..71c0e6b6b 100644
--- a/src/villas-compare.cpp
+++ b/src/villas-compare.cpp
@@ -193,7 +193,7 @@ protected:
   }
 
   int main() {
-    int ret, rc = 0, line, failed;
+    int ret, rc = 0, failed;
     unsigned eofs;
 
     ret = pool_init(&pool, filenames.size(),
@@ -211,7 +211,6 @@ protected:
       sides.push_back(s);
     }
 
-    line = 0;
     while (true) {
       // Read next sample from all files
     retry:
@@ -250,8 +249,6 @@ protected:
           goto out;
         }
       }
-
-      line++;
     }
 
   out: