diff --git a/src/hook.c b/src/hook.c
index 7b04cd27e..d30133410 100644
--- a/src/hook.c
+++ b/src/hook.c
@@ -18,7 +18,8 @@
 #include <villas/utils.h>
 #include <villas/pool.h>
 #include <villas/log.h>
-#include <config.h>
+
+#include "config.h"
 
 static void usage()
 {
diff --git a/src/node.c b/src/node.c
index a578f507a..4b8d9f681 100644
--- a/src/node.c
+++ b/src/node.c
@@ -12,8 +12,6 @@
 #include <unistd.h>
 #include <sched.h>
 
-#include "config.h"
-
 #include <villas/utils.h>
 #include <villas/cfg.h>
 #include <villas/path.h>
@@ -23,9 +21,11 @@
 #include <villas/kernel/rt.h>
 
 #ifdef ENABLE_OPAL_ASYNC
-  #include "opal.h"
+  #include <villas/nodes/opal.h>
 #endif
 
+#include "config.h"
+
 struct list paths;		/**< List of paths */
 struct list nodes;		/**< List of nodes */
 
diff --git a/src/signal.c b/src/signal.c
index 2d47dfa95..601c350d3 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -14,10 +14,11 @@
 #include <math.h>
 #include <string.h>
 
+#include <villas/utils.h>
+#include <villas/sample.h>
+#include <villas/timing.h>
+
 #include "config.h"
-#include "utils.h"
-#include "sample.h"
-#include "timing.h"
 
 #define CLOCKID	CLOCK_REALTIME
 
diff --git a/src/test.c b/src/test.c
index 18d8e8eef..8e4f56ae6 100644
--- a/src/test.c
+++ b/src/test.c
@@ -13,14 +13,15 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
+#include <villas/cfg.h>
+#include <villas/node.h>
+#include <villas/utils.h>
+#include <villas/hist.h>
+#include <villas/timing.h>
+#include <villas/pool.h>
+#include <villas/kernel/rt.h>
+
 #include "config.h"
-#include "cfg.h"
-#include "msg.h"
-#include "node.h"
-#include "utils.h"
-#include "hist.h"
-#include "timing.h"
-#include "pool.h"
 
 struct settings settings; /** <The global configuration */
 struct list nodes;		
@@ -85,8 +86,13 @@ int main(int argc, char *argv[])
 	list_init(&nodes);
 
 	log_init();
+	
+	info("Parsing configuration");
 	cfg_parse(argv[1], &config, &settings, &nodes, NULL);
 
+	info("Initialize real-time system");
+	rt_init(settings.affinity, settings.priority);
+	
 	info("Initialize memory system");
 	memory_init();