diff --git a/config_reader.cpp b/config_reader.cpp
index 23e3b88..036d9cc 100644
--- a/config_reader.cpp
+++ b/config_reader.cpp
@@ -126,7 +126,7 @@ ConfigReader::~ConfigReader()
 }
 std::vector<std::string> ConfigReader::ScanFolder()
 {
-    std::string path = std::string(CAFE_OS_SD_PATH) + std::string(WIIU_PATH) + "/controller";
+    std::string path = CONTROLLER_PATCHER_PATH;
     int dirhandle = 0;
     if(HID_DEBUG) log_printf("Opening %s\n",path.c_str());
     std::vector<std::string> config_files;
diff --git a/config_reader.h b/config_reader.h
index 7a56e3e..0e0b045 100644
--- a/config_reader.h
+++ b/config_reader.h
@@ -31,7 +31,7 @@
 #include "../dynamic_libs/fs_functions.h"
 #include "cp_retain_vars.h"
 
-
+#define CONTROLLER_PATCHER_PATH "/vol/external01/wiiu/controller";
 
 class ConfigReader
 {
diff --git a/controller_patcher.h b/controller_patcher.h
index f83ca84..67cb42c 100644
--- a/controller_patcher.h
+++ b/controller_patcher.h
@@ -22,8 +22,7 @@
 extern "C" {
 #endif
 
-#include "common/types.h"
-#include "common/common.h"
+#include <gctypes.h>
 #include "dynamic_libs/os_functions.h"
 #include "dynamic_libs/syshid_functions.h"
 #include "dynamic_libs/vpad_functions.h"