diff --git a/Common/ArmThunk.cpp b/Common/ArmThunk.cpp
index 19a01c8c80..4d25fb9150 100644
--- a/Common/ArmThunk.cpp
+++ b/Common/ArmThunk.cpp
@@ -47,7 +47,7 @@ void ThunkManager::Shutdown()
 	FreeCodeSpace();
 }
 
-void *ThunkManager::ProtectFunction(void *function, int num_params)
+const void *ThunkManager::ProtectFunction(const void *function, int num_params)
 {
 	_dbg_assert_msg_(JIT, false, "Arm ThunkManager not implemented?  Will crash.");
 	return NULL;
diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index be412443ea..39382d32a3 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -205,6 +205,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="ArmEmitter.cpp" />
+    <ClCompile Include="ArmThunk.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="ChunkFile.cpp" />
     <ClCompile Include="ConsoleListener.cpp" />
     <ClCompile Include="CPUDetect.cpp" />
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index c91b201d5a..84db6e63fe 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -64,6 +64,7 @@
       <Filter>Crypto</Filter>
     </ClCompile>
     <ClCompile Include="ChunkFile.cpp" />
+    <ClCompile Include="ArmThunk.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="CMakeLists.txt" />
diff --git a/Core/SaveState.cpp b/Core/SaveState.cpp
index 1b2d931b06..85015539f3 100644
--- a/Core/SaveState.cpp
+++ b/Core/SaveState.cpp
@@ -186,9 +186,9 @@ namespace SaveState
 			return next_ == first_;
 		}
 
-		static const int BLOCK_SIZE = 8192;
+		static const int BLOCK_SIZE;
 		// TODO: Instead, based on size of compressed state?
-		static const int BASE_USAGE_INTERVAL = 15;
+		static const int BASE_USAGE_INTERVAL;
 		typedef std::vector<u8> StateBuffer;
 		int first_;
 		int next_;
@@ -210,6 +210,8 @@ namespace SaveState
 	// TODO: Any reason for this to be configurable?
 	const static float rewindMaxWallFrequency = 1.0f;
 	static float rewindLastTime = 0.0f;
+	const int StateRingbuffer::BLOCK_SIZE = 8192;
+	const int StateRingbuffer::BASE_USAGE_INTERVAL = 15;
 
 	void SaveStart::DoState(PointerWrap &p)
 	{