diff --git a/include/villas/advio.h b/include/villas/advio.h
index d9eb904cf..15c56ebd8 100644
--- a/include/villas/advio.h
+++ b/include/villas/advio.h
@@ -26,7 +26,7 @@
 
 #include <curl/curl.h>
 
-#include "crypt.h"
+#include <villas/crypt.h>
 
 #ifdef __cplusplus
 extern "C"{
diff --git a/include/villas/atomic.h b/include/villas/atomic.h
index 25c8de132..2ae1a84be 100644
--- a/include/villas/atomic.h
+++ b/include/villas/atomic.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "common.h"
+#include <villas/common.h>
 
 #ifdef __cplusplus
 
diff --git a/include/villas/hook.h b/include/villas/hook.h
index 9af46b333..e80f6a46a 100644
--- a/include/villas/hook.h
+++ b/include/villas/hook.h
@@ -34,8 +34,8 @@
 
 #pragma once
 
-#include "hook_type.h"
-#include "common.h"
+#include <villas/hook_type.h>
+#include <villas/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/villas/io.h b/include/villas/io.h
index 3370b26de..c9e8a07a6 100644
--- a/include/villas/io.h
+++ b/include/villas/io.h
@@ -23,9 +23,9 @@
 
 #pragma once
 
-#include "advio.h"
-#include "common.h"
-#include "node.h"
+#include <villas/advio.h>
+#include <villas/common.h>
+#include <villas/node.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/villas/mapping.h b/include/villas/mapping.h
index 1db78444e..5bee741f6 100644
--- a/include/villas/mapping.h
+++ b/include/villas/mapping.h
@@ -25,9 +25,9 @@
 
 #include <jansson.h>
 
-#include "stats.h"
-#include "common.h"
-#include "list.h"
+#include <villas/stats.h>
+#include <villas/common.h>
+#include <villas/list.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/villas/node.h b/include/villas/node.h
index d8c5b4c58..85d376ded 100644
--- a/include/villas/node.h
+++ b/include/villas/node.h
@@ -32,11 +32,11 @@
 #include <netinet/in.h>
 #include <jansson.h>
 
-#include "node_type.h"
-#include "sample.h"
-#include "list.h"
-#include "queue.h"
-#include "common.h"
+#include <villas/node_type.h>
+#include <villas/sample.h>
+#include <villas/list.h>
+#include <villas/queue.h>
+#include <villas/common.h>
 
 #ifdef __cplusplus
 extern "C"{
diff --git a/include/villas/nodes/opal.h b/include/villas/nodes/opal.h
index 370b58957..10d96e514 100644
--- a/include/villas/nodes/opal.h
+++ b/include/villas/nodes/opal.h
@@ -31,8 +31,8 @@
 
 #include <pthread.h>
 
-#include "node.h"
-#include "msg.h"
+#include <villas/node.h>
+#include <villas/msg.h>
 
 /* Define RTLAB before including OpalPrint.h for messages to be sent
  * to the OpalDisplay. Otherwise stdout will be used. */
diff --git a/include/villas/path.h b/include/villas/path.h
index b8c2de58a..8df955f55 100644
--- a/include/villas/path.h
+++ b/include/villas/path.h
@@ -32,14 +32,14 @@
 #include <pthread.h>
 #include <jansson.h>
 
-#include "list.h"
-#include "queue.h"
-#include "pool.h"
-#include "bitset.h"
-#include "common.h"
-#include "hook.h"
-#include "mapping.h"
-#include "task.h"
+#include <villas/list.h>
+#include <villas/queue.h>
+#include <villas/pool.h>
+#include <villas/bitset.h>
+#include <villas/common.h>
+#include <villas/hook.h>
+#include <villas/mapping.h>
+#include <villas/task.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/villas/pool.h b/include/villas/pool.h
index c8075128d..d09b6452c 100644
--- a/include/villas/pool.h
+++ b/include/villas/pool.h
@@ -28,9 +28,9 @@
 #include <stddef.h>
 #include <sys/types.h>
 
-#include "queue.h"
-#include "common.h"
-#include "memory.h"
+#include <villas/queue.h>
+#include <villas/common.h>
+#include <villas/memory.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/villas/queue.h b/include/villas/queue.h
index 3bc7c969a..2c7b8c669 100644
--- a/include/villas/queue.h
+++ b/include/villas/queue.h
@@ -37,8 +37,8 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include "atomic.h"
-#include "common.h"
+#include <villas/atomic.h>
+#include <villas/common.h>
 
 #ifdef __cplusplus
 extern "C"{
diff --git a/include/villas/sample.h b/include/villas/sample.h
index fcc0326c2..83e4e6334 100644
--- a/include/villas/sample.h
+++ b/include/villas/sample.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include "atomic.h"
+#include <villas/atomic.h>
 
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/include/villas/stats.h b/include/villas/stats.h
index 904023c62..2ee375889 100644
--- a/include/villas/stats.h
+++ b/include/villas/stats.h
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <jansson.h>
 
-#include "hist.h"
+#include <villas/hist.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/villas/super_node.h b/include/villas/super_node.h
index d8f70e219..71d172e63 100644
--- a/include/villas/super_node.h
+++ b/include/villas/super_node.h
@@ -23,11 +23,11 @@
 
 #pragma once
 
-#include "list.h"
-#include "api.h"
-#include "web.h"
-#include "log.h"
-#include "common.h"
+#include <villas/list.h>
+#include <villas/api.h>
+#include <villas/web.h>
+#include <villas/log.h>
+#include <villas/common.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/villas/web.h b/include/villas/web.h
index 37958d35e..c7b06ea95 100644
--- a/include/villas/web.h
+++ b/include/villas/web.h
@@ -25,7 +25,7 @@
 
 #include <pthread.h>
 
-#include "common.h"
+#include <villas/common.h>
 
 #ifdef __cplusplus
 extern "C" {