diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index db36ea256..41a8bb95a 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/src/desmume.mk
 
 AM_CPPFLAGS += $(SDL_CFLAGS) $(GTHREAD_CFLAGS) $(X_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(LIBSOUNDTOUCH_CFLAGS)
 
-EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp cocoa
+EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc cocoa
 if HAVE_GDB_STUB
 SUBDIRS = . gdbstub $(UI_DIR)
 else
@@ -21,7 +21,6 @@ libdesmume_a_SOURCES = \
 	Disassembler.cpp Disassembler.h \
 	emufile.h emufile.cpp emufile_types.h encrypt.h encrypt.cpp FIFO.cpp FIFO.h \
 	firmware.cpp firmware.h GPU.cpp GPU.h \
-	fs.h \
 	GPU_osd.h \
 	instructions.h \
 	mem.h mc.cpp mc.h \
@@ -100,7 +99,14 @@ libdesmume_a_SOURCES = \
 	filter/videofilter.cpp filter/videofilter.h \
 	filter/xbrz.cpp filter/xbrz.h \
 	version.cpp version.h \
-	desmume_config.cpp desmume_config.h
+	desmume_config.cpp desmume_config.h \
+	libretro-common/compat/compat_getopt.c \
+	libretro-common/file/file_path.c \
+	libretro-common/file/retro_dirent.c \
+	libretro-common/file/retro_stat.c \
+	libretro-common/rthreads/async_job.c \
+	libretro-common/rthreads/rsemaphore.c \
+	libretro-common/rthreads/rthreads.c
 
 if HAVE_JIT
 libdesmume_a_SOURCES += \
@@ -205,4 +211,3 @@ endif
 if HAVE_GDB_STUB
 libdesmume_a_SOURCES += gdbstub.h
 endif
-libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
diff --git a/desmume/src/cli/main.cpp b/desmume/src/cli/main.cpp
index b0fa54dbc..42880bda1 100644
--- a/desmume/src/cli/main.cpp
+++ b/desmume/src/cli/main.cpp
@@ -198,8 +198,7 @@ fill_config( class configured_features *config,
     { NULL }
   };
 
-  config->loadCommonOptions();
-  g_option_context_add_main_entries (config->ctx, options, "options");
+  //g_option_context_add_main_entries (config->ctx, options, "options");
   config->parse(argc,argv);
 
   if(!config->validate())
diff --git a/desmume/src/desmume.mk b/desmume/src/desmume.mk
index cfdf61069..5975fb515 100644
--- a/desmume/src/desmume.mk
+++ b/desmume/src/desmume.mk
@@ -1,3 +1,3 @@
 AM_CFLAGS = 
-AM_CPPFLAGS = -I$(top_srcdir)/src
-AM_LDFLAGS =
\ No newline at end of file
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/libretro-common/include
+AM_LDFLAGS =
diff --git a/desmume/src/gtk-glade/gdk_gl.cpp b/desmume/src/gtk-glade/gdk_gl.cpp
index 48740269e..bbdb14a54 100755
--- a/desmume/src/gtk-glade/gdk_gl.cpp
+++ b/desmume/src/gtk-glade/gdk_gl.cpp
@@ -237,7 +237,7 @@ static void my_gl_Texture2D() {
 
 static void
 my_gl_ScreenTex( int software_convert) {
-  u16 *gpuFramebuffer = GPU->GetDisplayInfo().masterNativeBuffer;
+  u16 *gpuFramebuffer = (u16 *)GPU->GetDisplayInfo().masterNativeBuffer;
 
   if ( software_convert) {
     u8 converted[256 * 384 * 3];
diff --git a/desmume/src/gtk/main.cpp b/desmume/src/gtk/main.cpp
index 81d4646fd..2e9fa593d 100644
--- a/desmume/src/gtk/main.cpp
+++ b/desmume/src/gtk/main.cpp
@@ -694,9 +694,8 @@ fill_configured_features( class configured_features *config,
     { NULL }
   };
 
-  config->loadCommonOptions();
-  g_option_context_add_main_entries (config->ctx, options, "options");
-  g_option_context_add_group (config->ctx, gtk_get_option_group (TRUE));
+  //g_option_context_add_main_entries (config->ctx, options, "options");
+  //g_option_context_add_group (config->ctx, gtk_get_option_group (TRUE));
   config->parse(argc,argv);
 
   if(!config->validate())