diff --git a/SConstruct b/SConstruct
index 5876736f39..5d9165a8b7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -276,7 +276,7 @@ else:
     env['HAVE_COCOA'] = 0
    
 # handling wx flags CCFLAGS should be created before
-wxmods = ['adv', 'core', 'base']
+wxmods = ['aui', 'adv', 'core', 'base']
 env['USE_WX'] = 0
 if env['wxgl']:
     wxmods.append('gl')
diff --git a/Source/Core/DSPCore/Src/DSPIntUtil.h b/Source/Core/DSPCore/Src/DSPIntUtil.h
index 36af7021a5..aabf286eda 100644
--- a/Source/Core/DSPCore/Src/DSPIntUtil.h
+++ b/Source/Core/DSPCore/Src/DSPIntUtil.h
@@ -180,12 +180,12 @@ inline s64 dsp_get_long_prod()
 	ProfilerAddDelta(g_dsp.err_pc, 1);
 #endif
 
-	s64 val   = (s8)g_dsp.r[0x16];
+	s64 val   = (s8)g_dsp.r[DSP_REG_PRODH];
 	val <<= 32;
-	s64 low_prod  = g_dsp.r[0x15];
-	low_prod += g_dsp.r[0x17];
+	s64 low_prod  = g_dsp.r[DSP_REG_PRODM];
+	low_prod += g_dsp.r[DSP_REG_PRODM2];
 	low_prod <<= 16;
-	low_prod |= g_dsp.r[0x14];
+	low_prod |= g_dsp.r[DSP_REG_PRODL];
 	val += low_prod;
 	return val;
 }
@@ -198,12 +198,12 @@ inline void dsp_set_long_prod(s64 val)
 	ProfilerAddDelta(g_dsp.err_pc, 1);
 #endif
 
-	g_dsp.r[0x14] = (u16)val;
+	g_dsp.r[DSP_REG_PRODL] = (u16)val;
 	val >>= 16;
-	g_dsp.r[0x15] = (u16)val;
+	g_dsp.r[DSP_REG_PRODM] = (u16)val;
 	val >>= 16;
-	g_dsp.r[0x16] = (u16)val;
-	g_dsp.r[0x17] = 0;
+	g_dsp.r[DSP_REG_PRODH] = (u16)val;
+	g_dsp.r[DSP_REG_PRODM2] = 0;
 }
 
 // ---------------------------------------------------------------------------------------
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 31cd721074..44bdf8cfad 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -228,7 +228,7 @@ class CFrame : public wxFrame
 		void GameListChanged(wxCommandEvent& event);
 
 		void OnGameListCtrl_ItemActivated(wxListEvent& event);
-		void CFrame::DoFullscreen(bool _F);
+		void DoFullscreen(bool _F);
 
 		// MenuBar
 		// File - Drive