diff --git a/relocator/Makefile b/relocator/Makefile
index 5943f1f..be39451 100644
--- a/relocator/Makefile
+++ b/relocator/Makefile
@@ -35,7 +35,7 @@ SOURCES		:=	src
 
 DATA		:=	data
 
-INCLUDES	:=  src ../source
+INCLUDES	:=  src
 
 #---------------------------------------------------------------------------------
 # options for code generation
diff --git a/relocator/src/DynamicLinkingHelper.cpp b/relocator/src/DynamicLinkingHelper.cpp
index 59020ab..640563f 100644
--- a/relocator/src/DynamicLinkingHelper.cpp
+++ b/relocator/src/DynamicLinkingHelper.cpp
@@ -3,7 +3,7 @@
 #include <string.h>
 #include <vector>
 #include "logger.h"
-#include "common/module_defines.h"
+#include "../../source/common/module_defines.h"
 
 dyn_linking_function_t * DynamicLinkingHelper::getOrAddFunctionEntryByName(dyn_linking_relocation_data_t * data, const char* functionName) {
     if(data == NULL) {
diff --git a/relocator/src/DynamicLinkingHelper.h b/relocator/src/DynamicLinkingHelper.h
index 2077f56..a9a5a78 100644
--- a/relocator/src/DynamicLinkingHelper.h
+++ b/relocator/src/DynamicLinkingHelper.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "common/dynamic_linking_defines.h"
+#include "../../source/common/dynamic_linking_defines.h"
 #include "logger.h"
 #include <string>
 #include <vector>
diff --git a/relocator/src/ElfUtils.h b/relocator/src/ElfUtils.h
index 35cb8b1..5f8bec6 100644
--- a/relocator/src/ElfUtils.h
+++ b/relocator/src/ElfUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "common/relocation_defines.h"
+#include "../../source/common/relocation_defines.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/relocator/src/ModuleDataPersistence.cpp b/relocator/src/ModuleDataPersistence.cpp
index e7ac2bd..4cdf92b 100644
--- a/relocator/src/ModuleDataPersistence.cpp
+++ b/relocator/src/ModuleDataPersistence.cpp
@@ -1,6 +1,6 @@
 #include "ModuleDataPersistence.h"
 #include "DynamicLinkingHelper.h"
-#include "common/module_defines.h"
+#include "../../source/common/module_defines.h"
 #include "ModuleData.h"
 #include "RelocationData.h"
 #include <coreinit/cache.h>
diff --git a/relocator/src/ModuleDataPersistence.h b/relocator/src/ModuleDataPersistence.h
index 2c35ff6..fa8147f 100644
--- a/relocator/src/ModuleDataPersistence.h
+++ b/relocator/src/ModuleDataPersistence.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "common/module_defines.h"
+#include "../../source/common/module_defines.h"
 #include "ModuleData.h"
 
 class ModuleDataPersistence {
diff --git a/relocator/src/dynamic.c b/relocator/src/dynamic.c
index f125518..263bf73 100644
--- a/relocator/src/dynamic.c
+++ b/relocator/src/dynamic.c
@@ -21,7 +21,6 @@ EXPORT_VAR(uint32_t *, pMEMAllocFromDefaultHeapEx);
 EXPORT_VAR(uint32_t *, pMEMAllocFromDefaultHeap);
 EXPORT_VAR(uint32_t *, pMEMFreeToDefaultHeap);
 
-
 void InitFunctionPointers(void) {
     OSDynLoad_Module handle;
     addr_OSDynLoad_Acquire = (void*) 0x0102A3B4;
diff --git a/relocator/src/entry.cpp b/relocator/src/entry.cpp
index ad34d73..ec3a659 100644
--- a/relocator/src/entry.cpp
+++ b/relocator/src/entry.cpp
@@ -5,13 +5,13 @@
 #include <coreinit/dynload.h>
 #include <coreinit/cache.h>
 #include <nsysnet/socket.h>
-#include "common/dynamic_linking_defines.h"
-#include "common/module_defines.h"
+#include "../../source/common/dynamic_linking_defines.h"
+#include "../../source/common/module_defines.h"
 #include "RelocationData.h"
 #include "ModuleData.h"
 #include "ModuleDataPersistence.h"
 #include "ElfUtils.h"
-#include "common/relocation_defines.h"
+#include "../../source/common/relocation_defines.h"
 
 #include "logger.h"
 #include "dynamic.h"
diff --git a/relocator/src/logger.c b/relocator/src/logger.c
index 7f60772..74cc2b3 100644
--- a/relocator/src/logger.c
+++ b/relocator/src/logger.c
@@ -3,7 +3,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <utils/logger.h>
+#include "logger.h"
 #include <nsysnet/socket.h>
 #include <coreinit/debug.h>