diff --git a/plugins/sdcafiine/Makefile b/plugins/sdcafiine/Makefile
index 7296bb4..4d2a95a 100644
--- a/plugins/sdcafiine/Makefile
+++ b/plugins/sdcafiine/Makefile
@@ -33,7 +33,10 @@ export OBJCOPY	:=	$(PREFIX)objcopy
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR)).mod
 BUILD		:= 	build
-SOURCES		:=	src 
+SOURCES		:=	src \
+              src/common \
+              src/fs_wrapper \
+              src/utils
 
 DATA		:=	
 
@@ -96,7 +99,7 @@ MAKEFLAGS += --no-print-directory
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS	:= -lutils -ldynamiclibs
+LIBS	:= -lutils -ldynamiclibs -liosuhax
 #  
 
 #---------------------------------------------------------------------------------
diff --git a/plugins/sdcafiine/src/main.cpp b/plugins/sdcafiine/src/main.cpp
index 03b25e6..c601453 100644
--- a/plugins/sdcafiine/src/main.cpp
+++ b/plugins/sdcafiine/src/main.cpp
@@ -3,15 +3,16 @@
 #include <dynamic_libs/os_functions.h>
 #include <dynamic_libs/vpad_functions.h>
 #include <dynamic_libs/sys_functions.h>
+#include <dynamic_libs/fs_functions.h>
 #include <dynamic_libs/proc_ui_functions.h>
 #include <dynamic_libs/socket_functions.h>
 #include <fs/sd_fat_devoptab.h>
-#include <fswrapper/FileReplacerUtils.h>
-#include <fswrapper/fs_default_os_wrapper.h>
 #include <utils/logger.h>
 #include "utils/fs_utils.h"
 #include "common/retain_vars.h"
 #include <iosuhax.h>
+#include "common/retain_vars.h"
+#include "fs_wrapper/fs_retain_vars.h"
 #include "common/common.h"
 #include "main.h"
 
diff --git a/plugins/sdcafiine/src/patches.cpp b/plugins/sdcafiine/src/patches.cpp
index 1ca0d8f..c7cf6d5 100644
--- a/plugins/sdcafiine/src/patches.cpp
+++ b/plugins/sdcafiine/src/patches.cpp
@@ -5,8 +5,8 @@
 #include <dynamic_libs/sys_functions.h>
 #include <dynamic_libs/proc_ui_functions.h>
 #include <dynamic_libs/socket_functions.h>
-#include <fswrapper/FileReplacerUtils.h>
-#include <fswrapper/fs_default_os_wrapper.h>
+#include "fs_wrapper/FileReplacerUtils.h"
+#include "fs_wrapper/fs_default_os_wrapper.h"
 #include <utils/logger.h>
 #include "utils/fs_utils.h"
 #include "common/retain_vars.h"