diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.h b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.h
index ab4c379d93..19541f90bf 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Debugger/Debugger.h
@@ -23,7 +23,6 @@
 #define __CDebugger_h__
 
 
-// ---------------------------------------------------------------------------------------
 // wx stuff, I'm not sure if we use all these
 #ifndef WX_PRECOMP
 	#include <wx/wx.h>
@@ -41,19 +40,16 @@
 #include <wx/filepicker.h>
 #include <wx/listctrl.h>
 #include <wx/imaglist.h>
-// ------------
 
 #include "../Globals.h"
 
 class CPBView;
 class IniFile;
 
-// =======================================================================================
 // Window settings - I'm not sure what these do. I just copied them gtom elsewhere basically.
 #undef CDebugger_STYLE
 
 #define CDebugger_STYLE wxDEFAULT_FRAME_STYLE | wxCLIP_CHILDREN | wxNO_FULL_REPAINT_ON_RESIZE
-// =======================================================================================
 
 class CDebugger : public wxDialog
 {
@@ -61,7 +57,7 @@ class CDebugger : public wxDialog
 		DECLARE_EVENT_TABLE();
 		
 	public:
-		CDebugger(wxWindow *parent, wxWindowID id = 1, const wxString &title = wxT("Sound Debugger"),
+		CDebugger(wxWindow *parent, wxWindowID id = 1, const wxString &title = _("Sound Debugger"),
 			const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
 			long style = CDebugger_STYLE);
 
@@ -89,7 +85,6 @@ class CDebugger : public wxDialog
 		wxStaticBox *m_Label[1];
 		wxPanel *m_Controller;
 
-		// ---------------------------------------------------------------------------------------
 		// WARNING: Make sure these are not also elsewhere, for example in resource.h.
 		enum
 		{
@@ -108,8 +103,6 @@ class CDebugger : public wxDialog
 			ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
 
 		};
-		// ---------------------------------------------------------------------------------------
-		
 		
 		void OnClose(wxCloseEvent& event);
 		void CreateGUIControls();		
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
index 58985ced11..1b1cd985e7 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/Logging/Logging.cpp
@@ -23,7 +23,7 @@
 
 // Includes
 
-#include "../Globals.h"
+
 #include <iostream>
 #include <vector>
 #include <string> // so that we can test std::string == abc
@@ -31,15 +31,15 @@
 	#include <windows.h>
 #endif
 
+#include "../Debugger/Debugger.h"
+#include "../Debugger/PBView.h"
+#include "Console.h" // open and close console, clear console window
+
+#include "../Globals.h"
 #include "../UCodes/UCodes.h"
 #include "../UCodes/UCode_AXStructs.h"
 #include "../UCodes/UCode_AX.h"
 
-#include "../Debugger/PBView.h"
-#include "../Debugger/Debugger.h"
-#include "Console.h" // open and close console, clear console window
-
-
 // Externals
 
 float ratioFactor; // a global to get the ratio factor from MixAdd
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
index d436e3aaa7..08bd17ff95 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
@@ -15,7 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "../Globals.h"
+#include "../Debugger/Debugger.h"
 
 #ifdef _WIN32
 #include "../PCHW/DSoundStream.h"
@@ -27,7 +27,6 @@
 #include "UCode_AXStructs.h"
 #include "UCode_AX.h"
 
-#include "../Debugger/Debugger.h"
 // ---------------------------------------------------------------------------------------
 // Externals
 // -----------
diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
index a76c2fc5ed..aee34d0519 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/main.cpp
@@ -16,10 +16,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 
-// =======================================================================================
-// Includes
-// ------------------
-#include "Globals.h"
+#include "Debugger/Debugger.h" // for the CDebugger class
 #include "ChunkFile.h"
 #include "resource.h"
 
@@ -36,7 +33,6 @@
 #include "DSPHandler.h"
 #include "Config.h"
 
-#include "Debugger/Debugger.h" // for the CDebugger class
 #include "Logging/Console.h" // for startConsoleWin, wprintf, GetConsoleHwnd
 // ===================
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
index 073413206d..ca33c729d3 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript
+++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript
@@ -8,13 +8,11 @@ import utils
 
 files = [
 	'BPStructs.cpp',
-	'DataReader.cpp',
 	'Globals.cpp',
 	'GLInit.cpp',
 	'main.cpp',
 	'memcpy_amd.cpp',
 	'OpcodeDecoding.cpp',
-#	'OpcodeReaders.cpp', # outdated
 	'PixelShader.cpp',
 	'PixelShaderManager.cpp',
 	'rasterfont.cpp',