diff --git a/Makefile.host b/Makefile.host
index e390398..8ccd3f8 100644
--- a/Makefile.host
+++ b/Makefile.host
@@ -26,8 +26,8 @@ SRCS := $(wildcard $(SRC_DIR)/*.c $(SRC_DIR)/caps/*.c $(SRC_DIR)/dms/*.c $(SRC_D
 
 SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support.c src/svgancui.c src/build68k.c src/catweasel.c \
 	src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \
-	src/filesys.c src/fsdb.c src/fsdb_unix.c src/hardfile_unix.c src/genblitter.c src/gencomp.c src/gencpu.c \
-	src/hardfile.c src/genlinetoscr.c src/compemu.c src/compstbl.c src/fsusage.c src/filesys_unix.c \
+	src/genblitter.c src/gencomp.c src/gencpu.c \
+	src/genlinetoscr.c src/compemu.c src/compstbl.c \
 	src/enforcer.c src/ar.c src/debug.c \
 	src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
 
@@ -44,7 +44,7 @@ all: uae-host.elf
 # How to delete the intermediate files.
 clean:
 	@echo Cleaning $(OBJ_DIR)
-	@rm -rf $(OBJS) $(OBJ_DIR) src/machdep src/target.h src/md-fpp.h $(SYMLINKS)
+	@rm -rf $(OBJS) $(OBJ_DIR) src/machdep src/target.h src/md-fpp.h src/sysconfig.h $(SYMLINKS)
 
 $(OBJ_DIR):
 	install -d $@
@@ -113,7 +113,7 @@ $(BIN_DIR)/%.dol: %.elf
 COMMON_FLAGS	:= -g -Wall $(MACHDEP)
 INCLUDES	:= -Isrc/md-generic/ -Isrc/include -Isrc -I/usr/include/SDL
 DEFINES		:=  -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \
-		    -DFPUEMU -DAGA -DAUTOCONFIG
+		    -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS
 CFLAGS		:= $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
 
 #unused defines; -DFDI2RAW 
diff --git a/Makefile.wii b/Makefile.wii
index 5e73bf9..d4e351f 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -31,8 +31,8 @@ SRCS := $(wildcard $(SRC_DIR)/*.c $(SRC_DIR)/caps/*.c $(SRC_DIR)/dms/*.c $(SRC_D
 
 SRCS := $(filter-out src/compemu_raw_x86.c src/compemu_fpp.c src/compemu_support.c src/svgancui.c src/build68k.c src/catweasel.c \
 	src/cdrom.c src/blkdev-libscg.c src/blkdev.c src/blitops.c src/akiko.c src/filesys_bootrom.c \
-	src/filesys.c src/fsdb.c src/fsdb_unix.c src/hardfile_unix.c src/genblitter.c src/gencomp.c src/gencpu.c \
-	src/hardfile.c src/genlinetoscr.c src/compemu.c src/compstbl.c src/fsusage.c src/filesys_unix.c \
+	src/genblitter.c src/gencomp.c src/gencpu.c \
+	src/genlinetoscr.c src/compemu.c src/compstbl.c \
 	src/enforcer.c src/ar.c src/debug.c \
 	src/readdisk.c src/gengenblitter.c src/scsiemul.c src/tui.c src/linetoscr.c, $(SRCS))
 
@@ -49,7 +49,7 @@ all: uae.dol
 # How to delete the intermediate files.
 clean:
 	@echo Cleaning $(OBJ_DIR)
-	@rm -rf $(OBJS) $(OBJ_DIR) src/machdep src/target.h src/md-fpp.h $(SYMLINKS)
+	@rm -rf $(OBJS) $(OBJ_DIR) src/machdep src/target.h src/md-fpp.h src/sysconfig.h $(SYMLINKS)
 
 $(OBJ_DIR):
 	install -d $@
@@ -118,7 +118,7 @@ $(BIN_DIR)/%.dol: %.elf
 COMMON_FLAGS	:= -g -O3 -G8 -mrvl -Wall -D__inline__=__inline__ $(MACHDEP)
 INCLUDES	:=  -Isrc/md-generic/ -Isrc/include -Isrc -I$(DEVKITPRO)/libogc/include -I$(DEVKITPRO)/libogc/include/SDL
 DEFINES		:=  -DOS_WITHOUT_MEMORY_MANAGEMENT -DSAVESTATE -DUSE_SDL -DSUPPORT_THREADS -DCPUEMU_0 -DCPUEMU_5 -DCPUEMU_6 \
-		    -DFPUEMU -DAGA -DAUTOCONFIG
+		    -DFPUEMU -DAGA -DAUTOCONFIG -DFILESYS
 CFLAGS		:= $(COMMON_FLAGS) $(INCLUDES) $(DEFINES)
 
 #unused defines; -DFDI2RAW 
diff --git a/src/filesys.c b/src/filesys.c
index 99c41cb..d920b67 100644
--- a/src/filesys.c
+++ b/src/filesys.c
@@ -67,7 +67,7 @@ static int wii_access (const char *pathname, int mode)
 
 	if (stat(pathname, &st) < 0)
 		return -1;
-	if (mode == R_OK && !S_ISDIR(st))
+	if (mode == R_OK && !S_ISDIR(st.st_mode))
 		return 0;
 	return -1;
 }
diff --git a/src/include/sysdeps.h b/src/include/sysdeps.h
index f3917e8..18ecca9 100644
--- a/src/include/sysdeps.h
+++ b/src/include/sysdeps.h
@@ -333,3 +333,15 @@ extern int gui_message_multibutton (int flags, const char *format,...);
 #ifndef MAX_DPATH
 # define MAX_DPATH        512
 #endif
+
+#ifdef GEKKO
+/* Technically not true, but looking at libfat, it seems like
+ * unlink can remove directories as well */
+# define rmdir unlink
+
+/* Definately problems! */
+# define chmod(a,b)
+# define dup(fd) fd
+# define utime(filename, buf) 0
+#endif
+