diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt
index 643b0133c3..1952f163ef 100644
--- a/pcsx2/CMakeLists.txt
+++ b/pcsx2/CMakeLists.txt
@@ -1415,7 +1415,6 @@ set(pcsx2x86Sources
x86/iCore.cpp
x86/iFPU.cpp
x86/iFPUd.cpp
- x86/iMisc.cpp
x86/iMMI.cpp
x86/iR3000A.cpp
x86/iR3000Atables.cpp
diff --git a/pcsx2/Common.h b/pcsx2/Common.h
index b24f373b9e..b72ce3a0c1 100644
--- a/pcsx2/Common.h
+++ b/pcsx2/Common.h
@@ -32,9 +32,4 @@ extern s64 PSXCLK; /* 36.864 Mhz */
#include "DebugTools/Debug.h"
extern wxString ShiftJIS_ConvertString( const char* src );
-extern wxString ShiftJIS_ConvertString( const char* src, int maxlen );
-
-// Some homeless externs. This is as good a spot as any for now...
-
-extern void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR);
-extern SSE_MXCSR g_sseVUMXCSR, g_sseMXCSR;
+extern wxString ShiftJIS_ConvertString( const char* src, int maxlen );
\ No newline at end of file
diff --git a/pcsx2/System.cpp b/pcsx2/System.cpp
index fd0742f530..bb21e73eb8 100644
--- a/pcsx2/System.cpp
+++ b/pcsx2/System.cpp
@@ -29,12 +29,29 @@
#include "common/StringUtil.h"
#include "CDVD/CDVD.h"
+#include "common/emitter/x86_intrin.h"
+
#ifdef PCSX2_CORE
#include "GSDumpReplayer.h"
extern R5900cpu GSDumpReplayerCpu;
#endif
+SSE_MXCSR g_sseMXCSR = {DEFAULT_sseMXCSR};
+SSE_MXCSR g_sseVUMXCSR = {DEFAULT_sseVUMXCSR};
+
+// SetCPUState -- for assignment of SSE roundmodes and clampmodes.
+//
+void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR)
+{
+ //Msgbox::Alert("SetCPUState: Config.sseMXCSR = %x; Config.sseVUMXCSR = %x \n", Config.sseMXCSR, Config.sseVUMXCSR);
+
+ g_sseMXCSR = sseMXCSR.ApplyReserveMask();
+ g_sseVUMXCSR = sseVUMXCSR.ApplyReserveMask();
+
+ _mm_setcsr(g_sseMXCSR.bitmask);
+}
+
// --------------------------------------------------------------------------------------
// RecompiledCodeReserve (implementations)
// --------------------------------------------------------------------------------------
diff --git a/pcsx2/System.h b/pcsx2/System.h
index 4555e2b4ad..54dd3819e6 100644
--- a/pcsx2/System.h
+++ b/pcsx2/System.h
@@ -201,3 +201,6 @@ namespace Msgbox
#ifdef _WIN32
extern void CheckIsUserOnHighPerfPowerPlan();
#endif
+
+extern void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR);
+extern SSE_MXCSR g_sseVUMXCSR, g_sseMXCSR;
diff --git a/pcsx2/pcsx2.vcxproj b/pcsx2/pcsx2.vcxproj
index 680832e2dc..16a45597a6 100644
--- a/pcsx2/pcsx2.vcxproj
+++ b/pcsx2/pcsx2.vcxproj
@@ -542,7 +542,6 @@
-
diff --git a/pcsx2/pcsx2.vcxproj.filters b/pcsx2/pcsx2.vcxproj.filters
index ff203dd196..01b4ca8371 100644
--- a/pcsx2/pcsx2.vcxproj.filters
+++ b/pcsx2/pcsx2.vcxproj.filters
@@ -443,9 +443,6 @@
System
-
- System
-
System
diff --git a/pcsx2/pcsx2core.vcxproj b/pcsx2/pcsx2core.vcxproj
index 89e5c49063..baf57929fb 100644
--- a/pcsx2/pcsx2core.vcxproj
+++ b/pcsx2/pcsx2core.vcxproj
@@ -314,7 +314,6 @@
-
diff --git a/pcsx2/pcsx2core.vcxproj.filters b/pcsx2/pcsx2core.vcxproj.filters
index 1bcac18972..7a0e10b31b 100644
--- a/pcsx2/pcsx2core.vcxproj.filters
+++ b/pcsx2/pcsx2core.vcxproj.filters
@@ -353,9 +353,6 @@
System
-
- System
-
System
diff --git a/pcsx2/x86/iMisc.cpp b/pcsx2/x86/iMisc.cpp
deleted file mode 100644
index ce0849b810..0000000000
--- a/pcsx2/x86/iMisc.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/* PCSX2 - PS2 Emulator for PCs
- * Copyright (C) 2002-2010 PCSX2 Dev Team
- *
- * PCSX2 is free software: you can redistribute it and/or modify it under the terms
- * of the GNU Lesser General Public License as published by the Free Software Found-
- * ation, either version 3 of the License, or (at your option) any later version.
- *
- * PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with PCSX2.
- * If not, see .
- */
-
-
-#include "PrecompiledHeader.h"
-#include "common/emitter/x86_intrin.h"
-
-SSE_MXCSR g_sseMXCSR = {DEFAULT_sseMXCSR};
-SSE_MXCSR g_sseVUMXCSR = {DEFAULT_sseVUMXCSR};
-
-// SetCPUState -- for assignment of SSE roundmodes and clampmodes.
-//
-void SetCPUState(SSE_MXCSR sseMXCSR, SSE_MXCSR sseVUMXCSR)
-{
- //Msgbox::Alert("SetCPUState: Config.sseMXCSR = %x; Config.sseVUMXCSR = %x \n", Config.sseMXCSR, Config.sseVUMXCSR);
-
- g_sseMXCSR = sseMXCSR.ApplyReserveMask();
- g_sseVUMXCSR = sseVUMXCSR.ApplyReserveMask();
-
- _mm_setcsr(g_sseMXCSR.bitmask);
-}