diff --git a/Source/Core/Common/Src/DynamicLibrary.cpp b/Source/Core/Common/Src/DynamicLibrary.cpp
index 401c7bc993..98cce2f2b6 100644
--- a/Source/Core/Common/Src/DynamicLibrary.cpp
+++ b/Source/Core/Common/Src/DynamicLibrary.cpp
@@ -120,11 +120,10 @@ int DynamicLibrary::Unload()
 			library_file.c_str(), library);
 #ifdef _WIN32
 	retval = FreeLibrary(library);
+#elif defined __linux__
+	retval = dlclose(library) ? 0 : 1;
 #else
-	if (library == RTLD_SELF)
-		return 1;
-	else
-		retval = dlclose(library) ? 0 : 1;
+	return 1;
 #endif
 
 	if (! retval) {
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 8863f92219..9b57ebb55a 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -24,8 +24,6 @@ if env['HAVE_WX']:
 		'ARCodeAddEdit.cpp',
 		'GeckoCodeDiag.cpp',
 		'ConfigMain.cpp',
-		'DSPHLEConfigDlg.cpp',
-		'DSPLLEConfigDlg.cpp',
 		'Frame.cpp',
 		'FrameAui.cpp',
 		'FrameTools.cpp',