15 files changed, 41 insertions, 41 deletions
diff --git a/src/PL0/PL0_utils.c b/src/PL0/PL0_utils.c
index d83edb9..b9853fb 100644
--- a/src/PL0/PL0_utils.c
+++ b/src/PL0/PL0_utils.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "svc_interface.h"
+#include "../utils/svc_interface.h"
 #include "PL0_utils.h"
 
 // most generic definition possible
diff --git a/src/PL0/PL0_utils.h b/src/PL0/PL0_utils.h
index c26a100..e87b1f0 100644
--- a/src/PL0/PL0_utils.h
+++ b/src/PL0/PL0_utils.h
@@ -1,6 +1,6 @@
 #ifndef PL0_UTILS_H
 #define PL0_UTILS_H
 
-#include "io.h"
+#include "../utils/io.h"
 
 #endif // PL0_UTILS_H
diff --git a/src/atags/atags.c b/src/atags/atags.c
index 3f3d1ba..54740d8 100644
--- a/src/atags/atags.c
+++ b/src/atags/atags.c
@@ -1,5 +1,5 @@
 #include "atags.h"
-#include "utils/io.h"
+#include "../utils/io.h"
 
 static inline struct atag_header *next_tag(struct atag_header *tag)
 {
diff --git a/src/boot/loader_stage2.c b/src/boot/loader_stage2.c
index fc3ae1c..e08756b 100644
--- a/src/boot/loader_stage2.c
+++ b/src/boot/loader_stage2.c
@@ -1,8 +1,8 @@
 #include <stddef.h>
 #include <stdint.h>
-#include "uart.h"
-#include "io.h"
-#include "global.h"
+#include "../utils/uart.h"
+#include "../utils/io.h"
+#include "../global.h"
 
 void *const kernel_load_addr = ((void*) 0x8000);
 
diff --git a/src/boot/setup.c b/src/boot/setup.c
index a96b19e..2f74e64 100644
--- a/src/boot/setup.c
+++ b/src/boot/setup.c
@@ -1,12 +1,12 @@
-#include "uart.h"
-#include "utils/io.h"
-#include "demo_functionality.h"
-#include "paging.h"
-#include "atags.h"
+#include "../utils/uart.h"
+#include "../utils/io.h"
+#include "../demo/demo_functionality.h"
+#include "../memory/paging.h"
+#include "../atags/atags.h"
 // for POWER_OF_2() macro... perhaps the macro should be moved
-#include "memory.h"
-#include "armclock.h"
-#include "scheduler.h"
+#include "../memory/memory.h"
+#include "../clock/armclock.h"
+#include "../scheduler.h"
 
 void setup(uint32_t r0, uint32_t machine_type,
 	   struct atag_header *atags)
diff --git a/src/clock/armclock.h b/src/clock/armclock.h
index 32d6517..a109f9a 100644
--- a/src/clock/armclock.h
+++ b/src/clock/armclock.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "global.h"
+#include "../global.h"
 
 #define ARMCLK_LOAD                 (ARM_BASE + 0x400)
 #define ARMCLK_VALUE                (ARM_BASE + 0x404)
diff --git a/src/clock/bcmclock.h b/src/clock/bcmclock.h
index 7070283..f7535ae 100644
--- a/src/clock/bcmclock.h
+++ b/src/clock/bcmclock.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "global.h"
+#include "../global.h"
 
 #define ST_BASE (PERIF_BASE + 0x3000) // System Timer
 
diff --git a/src/demo/demo_functionality.c b/src/demo/demo_functionality.c
index 14e37f2..d9c0888 100644
--- a/src/demo/demo_functionality.c
+++ b/src/demo/demo_functionality.c
@@ -1,12 +1,12 @@
-#include "utils/io.h"
-#include "psr.h"
-#include "memory.h"
-#include "translation_table_descriptors.h"
-#include "ramfs.h"
-#include "utils/strings.h"
-#include "paging.h"
-#include "armclock.h"
-#include "scheduler.h"
+#include "../utils/io.h"
+#include "../boot/psr.h"
+#include "../memory/memory.h"
+#include "../memory/translation_table_descriptors.h"
+#include "../memory/ramfs.h"
+#include "../utils/strings.h"
+#include "../memory/paging.h"
+#include "../clock/armclock.h"
+#include "../scheduler.h"
 
 void demo_paging_support(void)
 {
diff --git a/src/interrupts/interrupts.c b/src/interrupts/interrupts.c
index 121d79c..5c30375 100644
--- a/src/interrupts/interrupts.c
+++ b/src/interrupts/interrupts.c
@@ -1,8 +1,8 @@
-#include "io.h"
-#include "uart.h"
-#include "svc_interface.h"
-#include "armclock.h"
-#include "scheduler.h"
+#include "../utils/io.h"
+#include "../utils/uart.h"
+#include "../utils/svc_interface.h"
+#include "../clock/armclock.h"
+#include "../scheduler.h"
 /**
     @brief The undefined instruction interrupt handler
 **/
diff --git a/src/memory/paging.c b/src/memory/paging.c
index c883d4e..aa18087 100644
--- a/src/memory/paging.c
+++ b/src/memory/paging.c
@@ -1,8 +1,8 @@
 #include "cp_regs.h"
-#include "utils/strings.h"
+#include "../utils/strings.h"
 #include "memory.h"
 #include "translation_table_descriptors.h"
-#include "utils/io.h"
+#include "../utils/io.h"
 
 #include "paging.h"
 
diff --git a/src/scheduler.c b/src/scheduler.c
index 141ba1d..146eb29 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -1,9 +1,9 @@
 #include "scheduler.h"
-#include "uart.h"
-#include "strings.h"
-#include "armclock.h"
-#include "memory.h"
-#include "io.h"
+#include "utils/uart.h"
+#include "utils/strings.h"
+#include "clock/armclock.h"
+#include "memory/memory.h"
+#include "utils/io.h"
 
 // for now we only have 1 process in "queue"
 // later there is going to be an actual queue
diff --git a/src/scheduler.h b/src/scheduler.h
index 8c0f569..58f659c 100644
--- a/src/scheduler.h
+++ b/src/scheduler.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#include "psr.h"
+#include "boot/psr.h"
 
 extern PSR_t PL1_PSR;
 
diff --git a/src/utils/pipe_image.c b/src/utils/pipe_image.c
index 77c3c07..b148ac4 100644
--- a/src/utils/pipe_image.c
+++ b/src/utils/pipe_image.c
@@ -3,7 +3,7 @@
 #include <endian.h>
 #include <stdint.h>
 #include <sys/types.h>
-#include "../lib/rs232/rs232.h"
+#include "../../lib/rs232/rs232.h"
 
 #define ANSI_FG_RED "\033[0;31m"
 #define ANSI_FG_DEFAULT "\033[0;39m"
diff --git a/src/utils/uart.c b/src/utils/uart.c
index 4dd1c2b..a389e41 100644
--- a/src/utils/uart.c
+++ b/src/utils/uart.c
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include "uart.h"
-#include "global.h"
+#include "../global.h"
 
 // Loop <delay> times in a way that the compiler won't optimize away
 static inline void delay(int32_t count)
diff --git a/src/utils/uart.h b/src/utils/uart.h
index 61c6a38..241b94b 100644
--- a/src/utils/uart.h
+++ b/src/utils/uart.h
@@ -2,7 +2,7 @@
 #define UART_H
 
 #include <stdint.h>
-#include "global.h"
+#include "../global.h"
 
 // The offsets for reach register.