diff --git a/Source/Core/DolphinWX/Src/PluginManager.cpp b/Source/Core/Core/Src/PluginManager.cpp
similarity index 85%
rename from Source/Core/DolphinWX/Src/PluginManager.cpp
rename to Source/Core/Core/Src/PluginManager.cpp
index ac9a9ddbab..b07fd2c279 100644
--- a/Source/Core/DolphinWX/Src/PluginManager.cpp
+++ b/Source/Core/Core/Src/PluginManager.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include "Globals.h"
+//#include "Globals.h"
 #include "FileSearch.h"
 #include "FileUtil.h"
 #include "PluginManager.h"
@@ -60,7 +60,7 @@ CPluginManager::~CPluginManager()
 // ----------------------------------------
 // Create list of available plugins
 // -------------
-void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
+void CPluginManager::ScanForPlugins()
 {
 	m_PluginInfos.clear();
 
@@ -75,22 +75,6 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
 
 	if (rFilenames.size() > 0)
 	{
-		/*
-		wxProgressDialog dialog(_T("Scanning for Plugins"),
-					_T("Scanning..."),
-					(int)rFilenames.size(), // range
-					_wxWindow, // parent
-					wxPD_CAN_ABORT |
-					wxPD_APP_MODAL |
-					// wxPD_AUTO_HIDE | -- try this as well
-					wxPD_ELAPSED_TIME |
-					wxPD_ESTIMATED_TIME |
-					wxPD_REMAINING_TIME |
-					wxPD_SMOOTH // - makes indeterminate mode bar on WinXP very small
-					);
-		dialog.CenterOnParent();
-		*/
-
 		for (size_t i = 0; i < rFilenames.size(); i++)
 		{
 			std::string orig_name = rFilenames[i];
@@ -102,18 +86,6 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
 				return;
 			}
 
-			/*
-			wxString msg;
-			char temp[128];
-			sprintf(temp,"Scanning %s", FileName.c_str());
-			msg = wxString::FromAscii(temp);
-			bool Cont = dialog.Update((int)i, msg);
-
-			if (!Cont)
-			{
-				break;
-			}
-			*/
 			CPluginInfo PluginInfo(orig_name.c_str());
 			if (PluginInfo.IsValid())
 			{
diff --git a/Source/Core/DolphinWX/Src/PluginManager.h b/Source/Core/Core/Src/PluginManager.h
similarity index 97%
rename from Source/Core/DolphinWX/Src/PluginManager.h
rename to Source/Core/Core/Src/PluginManager.h
index cc867747d0..f523e9b1c3 100644
--- a/Source/Core/DolphinWX/Src/PluginManager.h
+++ b/Source/Core/Core/Src/PluginManager.h
@@ -40,7 +40,7 @@ class CPluginManager
 {
 public:
 	static CPluginManager& GetInstance() {return(m_Instance);}
-	void ScanForPlugins(wxWindow* _wxWindow);
+	void ScanForPlugins();
 	void OpenConfig(void* _Parent, const char *_rFilename);
 	void OpenDebug(void* _Parent, const char *_rFilename, bool Type, bool Show);
 	const CPluginInfos& GetPluginInfos() {return(m_PluginInfos);}
diff --git a/Source/Core/Core/Src/SConscript b/Source/Core/Core/Src/SConscript
index 6a11e8baa6..fdad0da377 100644
--- a/Source/Core/Core/Src/SConscript
+++ b/Source/Core/Core/Src/SConscript
@@ -14,6 +14,7 @@ files = ["Console.cpp",
          "PatchEngine.cpp",
          "State.cpp",
          "Tracer.cpp",
+         'PluginManager.cpp',
          "VolumeHandler.cpp",
          "Boot/Boot.cpp",
          "Boot/Boot_BIOSEmu.cpp",
diff --git a/Source/Core/DebuggerWX/Src/CodeWindow.cpp b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
index 64ccbd1d85..f296e039ae 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindow.cpp
@@ -65,7 +65,7 @@
 
 #include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger
 #include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger
-#include "../../DolphinWX/Src/PluginManager.h"
+#include "PluginManager.h"
 #include "../../DolphinWX/Src/Config.h"
 
 
diff --git a/Source/Core/DebuggerWX/Src/CodeWindowSJP.cpp b/Source/Core/DebuggerWX/Src/CodeWindowSJP.cpp
index 54c4c05bbc..1c739f7fe3 100644
--- a/Source/Core/DebuggerWX/Src/CodeWindowSJP.cpp
+++ b/Source/Core/DebuggerWX/Src/CodeWindowSJP.cpp
@@ -65,7 +65,7 @@
 
 #include "Plugins/Plugin_DSP.h" // new stuff, to let us open the DLLDebugger
 #include "Plugins/Plugin_Video.h" // new stuff, to let us open the DLLDebugger
-#include "../../DolphinWX/Src/PluginManager.h"
+#include "PluginManager.h"
 #include "../../DolphinWX/Src/Config.h"
 
 
@@ -497,4 +497,4 @@ void CCodeWindow::OnToggleMemoryWindow(wxCommandEvent& event)
 		}
 	}
 }
-////////////////////////////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
+////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index 48aa5deb38..efa680bf54 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -308,7 +308,7 @@ CFrame::CFrame(wxFrame* parent,
 	
 	Show(); // Show the window
 
-	CPluginManager::GetInstance().ScanForPlugins(this);
+	CPluginManager::GetInstance().ScanForPlugins();
 
 	//if we are ever going back to optional iso caching: 
 	//m_GameListCtrl->Update(SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableIsoCache);
diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript
index 8a79b7d842..e64271c5d6 100644
--- a/Source/Core/DolphinWX/Src/SConscript
+++ b/Source/Core/DolphinWX/Src/SConscript
@@ -29,7 +29,7 @@ if wxenv['HAVE_WX']:
 		'ISOProperties.cpp',
 		'MemcardManager.cpp',
 		'MemoryCards/GCMemcard.cpp',
-		'PluginManager.cpp',
+#		'PluginManager.cpp',
 		'PatchAddEdit.cpp',
 		'CheatsWindow.cpp',
 		'stdafx.cpp',