diff --git a/lib/nodes/amqp.cpp b/lib/nodes/amqp.cpp
index 738771fb9..1a485b71d 100644
--- a/lib/nodes/amqp.cpp
+++ b/lib/nodes/amqp.cpp
@@ -27,7 +27,7 @@
 
 #include <villas/plugin.h>
 #include <villas/nodes/amqp.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/format_type.h>
 
 static void amqp_default_ssl_info(struct amqp_ssl_info *s)
diff --git a/lib/nodes/comedi.cpp b/lib/nodes/comedi.cpp
index b4855e3e6..6c2e7c2c1 100644
--- a/lib/nodes/comedi.cpp
+++ b/lib/nodes/comedi.cpp
@@ -29,7 +29,7 @@
 
 #include <villas/plugin.h>
 #include <villas/nodes/comedi.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 
 /* Utility functions to dump a comedi_cmd graciously taken from comedilib demo */
 static char* comedi_cmd_trigger_src(unsigned int src, char *buf);
@@ -1015,4 +1015,4 @@ __attribute__((destructor(110)))
 static void deregister_plugin() {
 	if (plugins.state != STATE_DESTROYED)
 		vlist_remove_all(&plugins, &p);
-}
\ No newline at end of file
+}
diff --git a/lib/nodes/file.cpp b/lib/nodes/file.cpp
index 13b37284a..9dccea6e6 100644
--- a/lib/nodes/file.cpp
+++ b/lib/nodes/file.cpp
@@ -28,7 +28,7 @@
 #include <errno.h>
 
 #include <villas/nodes/file.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/timing.h>
 #include <villas/queue.h>
 #include <villas/plugin.h>
diff --git a/lib/nodes/infiniband.cpp b/lib/nodes/infiniband.cpp
index 78ef79cc2..f09f92a0f 100644
--- a/lib/nodes/infiniband.cpp
+++ b/lib/nodes/infiniband.cpp
@@ -27,7 +27,7 @@
 #include <villas/node/config.h>
 #include <villas/nodes/infiniband.hpp>
 #include <villas/plugin.h>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/format_type.h>
 #include <villas/memory.h>
 #include <villas/memory/ib.h>
@@ -1032,4 +1032,4 @@ __attribute__((destructor(110)))
 static void deregister_plugin() {
 	if (plugins.state != STATE_DESTROYED)
 		vlist_remove_all(&plugins, &p);
-}
\ No newline at end of file
+}
diff --git a/lib/nodes/mqtt.cpp b/lib/nodes/mqtt.cpp
index a1d394747..a1cf96595 100644
--- a/lib/nodes/mqtt.cpp
+++ b/lib/nodes/mqtt.cpp
@@ -25,7 +25,7 @@
 
 #include <villas/nodes/mqtt.hpp>
 #include <villas/plugin.h>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/format_type.h>
 
 static void mqtt_log_cb(struct mosquitto *mosq, void *userdata, int level, const char *str)
diff --git a/lib/nodes/nanomsg.cpp b/lib/nodes/nanomsg.cpp
index 6130addde..ec0c3a990 100644
--- a/lib/nodes/nanomsg.cpp
+++ b/lib/nodes/nanomsg.cpp
@@ -26,7 +26,7 @@
 
 #include <villas/plugin.h>
 #include <villas/nodes/nanomsg.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/format_type.h>
 
 int nanomsg_reverse(struct node *n)
@@ -322,4 +322,4 @@ __attribute__((destructor(110)))
 static void deregister_plugin() {
 	if (plugins.state != STATE_DESTROYED)
 		vlist_remove_all(&plugins, &p);
-}
\ No newline at end of file
+}
diff --git a/lib/nodes/ngsi.cpp b/lib/nodes/ngsi.cpp
index a5814921f..f922508d9 100644
--- a/lib/nodes/ngsi.cpp
+++ b/lib/nodes/ngsi.cpp
@@ -29,7 +29,7 @@
 #include <unistd.h>
 
 #include <villas/nodes/ngsi.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/timing.h>
 #include <villas/plugin.h>
 #include <villas/node/config.h>
@@ -616,4 +616,4 @@ __attribute__((destructor(110)))
 static void deregister_plugin() {
 	if (plugins.state != STATE_DESTROYED)
 		vlist_remove_all(&plugins, &p);
-}
\ No newline at end of file
+}
diff --git a/lib/nodes/opal.cpp b/lib/nodes/opal.cpp
index c75924cf7..a17a949a1 100644
--- a/lib/nodes/opal.cpp
+++ b/lib/nodes/opal.cpp
@@ -26,7 +26,7 @@
 #include <math.h>
 
 #include <villas/nodes/opal.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/plugin.h>
 
 /* Private static storage */
@@ -333,4 +333,4 @@ __attribute__((destructor(110)))
 static void deregister_plugin() {
 	if (plugins.state != STATE_DESTROYED)
 		vlist_remove_all(&plugins, &p);
-}
\ No newline at end of file
+}
diff --git a/lib/nodes/rtp.cpp b/lib/nodes/rtp.cpp
index 28ed3bf54..540fa1e0d 100644
--- a/lib/nodes/rtp.cpp
+++ b/lib/nodes/rtp.cpp
@@ -41,7 +41,7 @@ extern "C" {
 
 #include <villas/plugin.h>
 #include <villas/nodes/socket.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/stats.h>
 #include <villas/hook.h>
 #include <villas/format_type.h>
diff --git a/lib/nodes/shmem.cpp b/lib/nodes/shmem.cpp
index 14b0407f1..7ccbb5358 100644
--- a/lib/nodes/shmem.cpp
+++ b/lib/nodes/shmem.cpp
@@ -34,7 +34,7 @@
 #include <villas/nodes/shmem.hpp>
 #include <villas/plugin.h>
 #include <villas/timing.h>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 
 int shmem_parse(struct node *n, json_t *cfg)
 {
@@ -224,4 +224,4 @@ __attribute__((destructor(110)))
 static void deregister_plugin() {
 	if (plugins.state != STATE_DESTROYED)
 		vlist_remove_all(&plugins, &p);
-}
\ No newline at end of file
+}
diff --git a/lib/nodes/socket.cpp b/lib/nodes/socket.cpp
index 4b965bfd1..0e0569054 100644
--- a/lib/nodes/socket.cpp
+++ b/lib/nodes/socket.cpp
@@ -27,7 +27,7 @@
 #include <netinet/ip.h>
 
 #include <villas/nodes/socket.hpp>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/format_type.h>
 #include <villas/sample.h>
 #include <villas/queue.h>
diff --git a/lib/nodes/websocket.cpp b/lib/nodes/websocket.cpp
index a813333c4..966ed2999 100644
--- a/lib/nodes/websocket.cpp
+++ b/lib/nodes/websocket.cpp
@@ -29,7 +29,7 @@
 #include <libwebsockets.h>
 
 #include <villas/timing.h>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/buffer.h>
 #include <villas/plugin.h>
 #include <villas/nodes/websocket.hpp>
diff --git a/lib/nodes/zeromq.cpp b/lib/nodes/zeromq.cpp
index 2aa65ee43..c54f45469 100644
--- a/lib/nodes/zeromq.cpp
+++ b/lib/nodes/zeromq.cpp
@@ -29,7 +29,7 @@
 
 #include <villas/nodes/zeromq.hpp>
 #include <villas/node.h>
-#include <villas/utils.h>
+#include <villas/utils.hpp>
 #include <villas/queue.h>
 #include <villas/plugin.h>
 #include <villas/format_type.h>