diff --git a/include/villas/nodes/iec61850.h b/include/villas/nodes/iec61850.h
index e587c4878..7dd31e4c2 100644
--- a/include/villas/nodes/iec61850.h
+++ b/include/villas/nodes/iec61850.h
@@ -35,8 +35,8 @@
 #include <libiec61850/goose_receiver.h>
 #include <libiec61850/sv_subscriber.h>
 
-#include "node.h"
-#include "list.h"
+#include <villas/node.h>
+#include <villas/list.h>
 
 enum iec61850_type {
 	/* According to IEC 61850-7-2 */
diff --git a/include/villas/nodes/iec61850_sv.h b/include/villas/nodes/iec61850_sv.h
index 4241f6a79..36f6e95d9 100644
--- a/include/villas/nodes/iec61850_sv.h
+++ b/include/villas/nodes/iec61850_sv.h
@@ -34,12 +34,11 @@
 #include <libiec61850/sv_publisher.h>
 #include <libiec61850/sv_subscriber.h>
 
-#include "queue_signalled.h"
-#include "pool.h"
-#include "node.h"
-#include "list.h"
-
-#include "nodes/iec61850.h"
+#include <villas/queue_signalled.h>
+#include <villas/pool.h>
+#include <villas/node.h>
+#include <villas/list.h>
+#include <villas/nodes/iec61850.h>
 
 struct iec61850_sv {
 	char *interface;
diff --git a/lib/kernel/tc_netem.c b/lib/kernel/tc_netem.c
index 77c4f59af..208fed4c6 100644
--- a/lib/kernel/tc_netem.c
+++ b/lib/kernel/tc_netem.c
@@ -259,7 +259,6 @@ int rtnl_netem_set_delay_distribution_data(struct rtnl_qdisc *qdisc, short *data
 	return 0;
 }
 
-
 /** Customized version of rtnl_netem_set_delay_distribution() of libnl */
 int tc_netem_set_delay_distribution(struct rtnl_qdisc *qdisc, json_t *json)
 {
diff --git a/lib/nodes/iec61850.c b/lib/nodes/iec61850.c
index 348df2f69..c14a5a21b 100644
--- a/lib/nodes/iec61850.c
+++ b/lib/nodes/iec61850.c
@@ -27,8 +27,8 @@
 #include <unistd.h>
 #include <netinet/ether.h>
 
-#include "nodes/iec61850_sv.h"
-#include "plugin.h"
+#include "villas/nodes/iec61850_sv.h"
+#include "villas/plugin.h"
 
 #define CONFIG_SV_DEFAULT_APPID 0x4000
 #define CONFIG_SV_DEFAULT_DST_ADDRESS CONFIG_GOOSE_DEFAULT_DST_ADDRESS
diff --git a/lib/nodes/iec61850_sv.c b/lib/nodes/iec61850_sv.c
index 477bdf885..80533c18b 100644
--- a/lib/nodes/iec61850_sv.c
+++ b/lib/nodes/iec61850_sv.c
@@ -29,8 +29,8 @@
 #include <unistd.h>
 #include <netinet/ether.h>
 
-#include "nodes/iec61850_sv.h"
-#include "plugin.h"
+#include "villas/nodes/iec61850_sv.h"
+#include "villas/plugin.h"
 
 #define CONFIG_SV_DEFAULT_APPID 0x4000
 #define CONFIG_SV_DEFAULT_DST_ADDRESS CONFIG_GOOSE_DEFAULT_DST_ADDRESS