diff --git a/include/villas/config.hpp b/include/villas/config.hpp
index bcbb31fd3..396e886c2 100644
--- a/include/villas/config.hpp
+++ b/include/villas/config.hpp
@@ -26,7 +26,7 @@
 #include <jansson.h>
 
 #include <villas/node/config.h>
-#include <villas/advio.h>
+#include <villas/advio.hpp>
 
 namespace villas {
 namespace node {
diff --git a/include/villas/io.h b/include/villas/io.h
index 7b8db4959..23f6b701e 100644
--- a/include/villas/io.h
+++ b/include/villas/io.h
@@ -23,8 +23,8 @@
 
 #pragma once
 
-#include <villas/advio.h>
-#include <villas/common.h>
+#include <villas/advio.hpp>
+#include <villas/common.hpp>
 #include <villas/node.h>
 #include <villas/signal.h>
 
diff --git a/include/villas/super_node.hpp b/include/villas/super_node.hpp
index c2b9bf899..a8a8b04e6 100644
--- a/include/villas/super_node.hpp
+++ b/include/villas/super_node.hpp
@@ -39,8 +39,8 @@ extern "C" {
 #include <villas/log.hpp>
 #include <villas/config.hpp>
 #include <villas/node.h>
-#include <villas/task.h>
-#include <villas/common.h>
+#include <villas/task.hpp>
+#include <villas/common.hpp>
 
 /* Forward declarations */
 struct node;
diff --git a/lib/api.cpp b/lib/api.cpp
index 8e4ca4cca..9efb4067e 100644
--- a/lib/api.cpp
+++ b/lib/api.cpp
@@ -26,7 +26,7 @@
 #include <villas/utils.hpp>
 #include <villas/node/config.h>
 #include <villas/memory.h>
-#include <villas/compat.h>
+#include <villas/compat.hpp>
 
 using namespace villas;
 using namespace villas::node;
diff --git a/lib/api/sessions/socket.cpp b/lib/api/sessions/socket.cpp
index 11292026d..1f016f4ba 100644
--- a/lib/api/sessions/socket.cpp
+++ b/lib/api/sessions/socket.cpp
@@ -22,7 +22,7 @@
 
 #include <sstream>
 
-#include <villas/compat.h>
+#include <villas/compat.hpp>
 #include <villas/log.hpp>
 #include <villas/api/sessions/socket.hpp>
 
diff --git a/lib/formats/json.cpp b/lib/formats/json.cpp
index 48cfc4f31..1cf84e799 100644
--- a/lib/formats/json.cpp
+++ b/lib/formats/json.cpp
@@ -22,7 +22,7 @@
 
 #include <villas/plugin.h>
 #include <villas/sample.h>
-#include <villas/compat.h>
+#include <villas/compat.hpp>
 #include <villas/signal.h>
 #include <villas/io.h>
 #include <villas/formats/json.h>
diff --git a/lib/formats/json_reserve.cpp b/lib/formats/json_reserve.cpp
index 8f5b8eb02..3c980e1ac 100644
--- a/lib/formats/json_reserve.cpp
+++ b/lib/formats/json_reserve.cpp
@@ -26,7 +26,7 @@
 #include <villas/sample.h>
 #include <villas/node.h>
 #include <villas/signal.h>
-#include <villas/compat.h>
+#include <villas/compat.hpp>
 #include <villas/timing.h>
 #include <villas/io.h>
 #include <villas/formats/json_reserve.h>
diff --git a/lib/formats/raw.cpp b/lib/formats/raw.cpp
index 5123c2e43..3497ef989 100644
--- a/lib/formats/raw.cpp
+++ b/lib/formats/raw.cpp
@@ -25,7 +25,7 @@
 #include <villas/utils.hpp>
 #include <villas/io.h>
 #include <villas/formats/raw.h>
-#include <villas/compat.h>
+#include <villas/compat.hpp>
 
 typedef float flt32_t;
 typedef double flt64_t;
diff --git a/lib/hooks/stats.cpp b/lib/hooks/stats.cpp
index bc789773d..5e747da3a 100644
--- a/lib/hooks/stats.cpp
+++ b/lib/hooks/stats.cpp
@@ -26,8 +26,8 @@
 
 #include <memory>
 
-#include <villas/common.h>
-#include <villas/advio.h>
+#include <villas/common.hpp>
+#include <villas/advio.hpp>
 #include <villas/hook.hpp>
 #include <villas/node/exceptions.hpp>
 #include <villas/stats.hpp>
diff --git a/lib/kernel/if.cpp b/lib/kernel/if.cpp
index 7586631b7..e2d2eb9bc 100644
--- a/lib/kernel/if.cpp
+++ b/lib/kernel/if.cpp
@@ -34,7 +34,7 @@
 #include <villas/kernel/tc.h>
 #include <villas/kernel/tc_netem.h>
 #include <villas/kernel/nl.h>
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 
 #include <villas/nodes/socket.hpp>
 
diff --git a/lib/kernel/tc.cpp b/lib/kernel/tc.cpp
index 4813cd618..50ad807a3 100644
--- a/lib/kernel/tc.cpp
+++ b/lib/kernel/tc.cpp
@@ -29,7 +29,7 @@
 
 #include <villas/utils.hpp>
 
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 #include <villas/kernel/if.h>
 #include <villas/kernel/tc.h>
 #include <villas/kernel/nl.h>
diff --git a/lib/kernel/tc_netem.cpp b/lib/kernel/tc_netem.cpp
index 3ce643725..f8e3249eb 100644
--- a/lib/kernel/tc_netem.cpp
+++ b/lib/kernel/tc_netem.cpp
@@ -31,7 +31,7 @@
 #include <villas/kernel/nl.h>
 #include <villas/kernel/nl-private.h>
 #include <villas/kernel/tc_netem.h>
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 #include <villas/utils.hpp>
 
 using namespace villas::utils;
diff --git a/lib/memory.cpp b/lib/memory.cpp
index fd19f7af1..3ebd02043 100644
--- a/lib/memory.cpp
+++ b/lib/memory.cpp
@@ -34,7 +34,7 @@
 #include <villas/log.h>
 #include <villas/memory.h>
 #include <villas/utils.hpp>
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 
 static std::unordered_map<void *, struct memory_allocation *> allocations;
 
diff --git a/lib/memory/mmap.cpp b/lib/memory/mmap.cpp
index 741a0eede..0ea0d7dd0 100644
--- a/lib/memory/mmap.cpp
+++ b/lib/memory/mmap.cpp
@@ -34,11 +34,11 @@
   #include <mach/vm_statistics.h>
 #endif /* __MACH__ */
 
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 #include <villas/log.h>
 #include <villas/memory.h>
 #include <villas/utils.hpp>
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 
 using namespace villas::utils;
 
diff --git a/lib/nodes/shmem.cpp b/lib/nodes/shmem.cpp
index e08f88019..0cda4c5b4 100644
--- a/lib/nodes/shmem.cpp
+++ b/lib/nodes/shmem.cpp
@@ -28,7 +28,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 #include <villas/log.h>
 #include <villas/shmem.h>
 #include <villas/nodes/shmem.hpp>
diff --git a/lib/nodes/socket.cpp b/lib/nodes/socket.cpp
index 7e09e79ca..f5c044a6d 100644
--- a/lib/nodes/socket.cpp
+++ b/lib/nodes/socket.cpp
@@ -32,7 +32,7 @@
 #include <villas/sample.h>
 #include <villas/queue.h>
 #include <villas/plugin.h>
-#include <villas/compat.h>
+#include <villas/compat.hpp>
 #include <villas/super_node.hpp>
 
 #ifdef WITH_SOCKET_LAYER_ETH
diff --git a/lib/pool.cpp b/lib/pool.cpp
index 9306a01ad..94469ceab 100644
--- a/lib/pool.cpp
+++ b/lib/pool.cpp
@@ -23,7 +23,7 @@
 #include <villas/utils.hpp>
 #include <villas/pool.h>
 #include <villas/memory.h>
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 
 int pool_init(struct pool *p, size_t cnt, size_t blocksz, struct memory_type *m)
 {
diff --git a/lib/shmem.cpp b/lib/shmem.cpp
index 2f6bccbca..373eace0b 100644
--- a/lib/shmem.cpp
+++ b/lib/shmem.cpp
@@ -27,7 +27,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-#include <villas/kernel/kernel.h>
+#include <villas/kernel/kernel.hpp>
 #include <villas/memory.h>
 #include <villas/utils.hpp>
 #include <villas/sample.h>
diff --git a/lib/super_node.cpp b/lib/super_node.cpp
index 4c7f67778..3dedcafb0 100644
--- a/lib/super_node.cpp
+++ b/lib/super_node.cpp
@@ -29,7 +29,7 @@
 #include <villas/utils.hpp>
 #include <villas/list.h>
 #include <villas/hook_list.hpp>
-#include <villas/advio.h>
+#include <villas/advio.hpp>
 #include <villas/plugin.h>
 #include <villas/memory.h>
 #include <villas/config_helper.hpp>
diff --git a/src/villas-relay.cpp b/src/villas-relay.cpp
index 923ddeb91..5002a2cec 100644
--- a/src/villas-relay.cpp
+++ b/src/villas-relay.cpp
@@ -32,7 +32,7 @@
 #include <jansson.h>
 
 #include <villas/node/config.h>
-#include <villas/compat.h>
+#include <villas/compat.hpp>
 #include <villas/memory.h>
 #include <villas/tool.hpp>
 #include <villas/log.hpp>