diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 1daed22c3..d53d5be96 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -52,7 +52,8 @@ libdesmume_a_SOURCES = \
 	cheatSystem.cpp cheatSystem.h \
 	texcache.cpp texcache.h rasterize.cpp rasterize.h \
 	metaspu/metaspu.cpp metaspu/metaspu.h \
-	version.cpp version.h
+	version.cpp version.h \
+	desmume_config.cpp desmume_config.h
 
 if HAVE_WX
 libdesmume_a_SOURCES += wxdlg/wxdlg3dViewer.cpp
diff --git a/desmume/src/cli/Makefile.am b/desmume/src/cli/Makefile.am
index 5d977af2e..143783535 100644
--- a/desmume/src/cli/Makefile.am
+++ b/desmume/src/cli/Makefile.am
@@ -4,7 +4,7 @@ include $(top_srcdir)/src/desmume.mk
 AM_CPPFLAGS += $(SDL_CFLAGS) $(ALSA_CFLAGS) $(LIBAGG_CFLAGS) $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
 
 bin_PROGRAMS = desmume-cli
-desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp ../gtk/desmume_config.h ../gtk/desmume_config.cpp
+desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp
 desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS) $(ALSA_LIBS) $(LIBAGG_LIBS) $(GLIB_LIBS) $(GTHREAD_LIBS)
 if HAVE_GDB_STUB
 desmume_cli_LDADD += ../gdbstub/libgdbstub.a
diff --git a/desmume/src/cli/main.cpp b/desmume/src/cli/main.cpp
index f50c6c1c6..8ff94a730 100644
--- a/desmume/src/cli/main.cpp
+++ b/desmume/src/cli/main.cpp
@@ -55,7 +55,7 @@
 #include "mic.h"
 #include "firmware.h"
 #include "GPU_osd.h"
-#include "gtk/desmume_config.h"
+#include "desmume_config.h"
 #ifdef GDB_STUB
 #include "gdbstub.h"
 #endif
diff --git a/desmume/src/gtk/desmume_config.cpp b/desmume/src/desmume_config.cpp
similarity index 100%
rename from desmume/src/gtk/desmume_config.cpp
rename to desmume/src/desmume_config.cpp
diff --git a/desmume/src/gtk/desmume_config.h b/desmume/src/desmume_config.h
similarity index 100%
rename from desmume/src/gtk/desmume_config.h
rename to desmume/src/desmume_config.h
diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am
index a638cdaf7..89ea3b516 100644
--- a/desmume/src/gtk-glade/Makefile.am
+++ b/desmume/src/gtk-glade/Makefile.am
@@ -26,8 +26,7 @@ desmume_glade_SOURCES =  \
 	dTools/callbacks_dtools.h \
 	dTools/dTools_display.h \
 	gdk_3Demu.cpp gdk_3Demu.h \
-	../sndsdl.h ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp \
-	../gtk/desmume_config.h ../gtk/desmume_config.cpp
+	../sndsdl.h ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp
 
 desmume_glade_LDADD = ../libdesmume.a \
 			$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
diff --git a/desmume/src/gtk-glade/main.cpp b/desmume/src/gtk-glade/main.cpp
index 2d8ee1451..5bc57a648 100755
--- a/desmume/src/gtk-glade/main.cpp
+++ b/desmume/src/gtk-glade/main.cpp
@@ -28,8 +28,7 @@
 #include "rasterize.h"
 #include "desmume.h"
 #include "firmware.h"
-
-#include "gtk/desmume_config.h"
+#include "desmume_config.h"
 
 #ifdef GDB_STUB
 #include "../gdbstub.h"
diff --git a/desmume/src/gtk/Makefile.am b/desmume/src/gtk/Makefile.am
index 28034aa19..0eb93c11f 100644
--- a/desmume/src/gtk/Makefile.am
+++ b/desmume/src/gtk/Makefile.am
@@ -16,7 +16,6 @@ desmume_SOURCES = \
 	../sndsdl.cpp \
 	../ctrlssdl.h ../ctrlssdl.cpp \
 	osmesa_3Demu.cpp osmesa_3Demu.h \
-	desmume_config.cpp desmume_config.h \
 	cheatsGTK.h cheatsGTK.cpp \
 	main.cpp main.h
 desmume_LDADD = ../libdesmume.a \