diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
index fde5b121b..4b2d56c79 100644
--- a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
+++ b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj
@@ -100,11 +100,26 @@
       <ObjectFileName>$(IntDir)Common\</ObjectFileName>
       <XMLDocumentationFileName>$(IntDir)Common\</XMLDocumentationFileName>
     </ClCompile>
+    <ClCompile Include="$(SrcDir)common\hotkey.cpp">
+      <AssemblerListingLocation>$(IntDir)Common\</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)Common\</ObjectFileName>
+      <XMLDocumentationFileName>$(IntDir)Common\</XMLDocumentationFileName>
+    </ClCompile>
     <ClCompile Include="$(SrcDir)common\log.cpp">
       <AssemblerListingLocation>$(IntDir)Common\</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)Common\</ObjectFileName>
       <XMLDocumentationFileName>$(IntDir)Common\</XMLDocumentationFileName>
     </ClCompile>
+    <ClCompile Include="$(SrcDir)common\json.cpp">
+      <AssemblerListingLocation>$(IntDir)Common\</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)Common\</ObjectFileName>
+      <XMLDocumentationFileName>$(IntDir)Common\</XMLDocumentationFileName>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)common\keyframe.cpp">
+      <AssemblerListingLocation>$(IntDir)Common\</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)Common\</ObjectFileName>
+      <XMLDocumentationFileName>$(IntDir)Common\</XMLDocumentationFileName>
+    </ClCompile>
     <ClCompile Include="$(SrcDir)common\mru.cpp">
       <AssemblerListingLocation>$(IntDir)Common\</AssemblerListingLocation>
       <ObjectFileName>$(IntDir)Common\</ObjectFileName>
diff --git a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
index e76eed75d..17b771425 100644
--- a/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
+++ b/aegisub/build/msbuild/libaegisub/libaegisub.vcxproj.filters
@@ -157,6 +157,15 @@
     <ClCompile Include="$(SrcDir)common\vfr.cpp">
       <Filter>Source Files\Common</Filter>
     </ClCompile>
+    <ClCompile Include="$(SrcDir)common\json.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)common\hotkey.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
+    <ClCompile Include="$(SrcDir)common\keyframe.cpp">
+      <Filter>Source Files\Common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="$(SrcDir)include\libaegisub\charsets.def">
diff --git a/aegisub/build/msbuild/lua51/lua51.vcxproj b/aegisub/build/msbuild/lua51/lua51.vcxproj
index 30f9e9af2..62bb346df 100644
--- a/aegisub/build/msbuild/lua51/lua51.vcxproj
+++ b/aegisub/build/msbuild/lua51/lua51.vcxproj
@@ -47,6 +47,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>LUA_BUILD_AS_DLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+	  <CompileAs>CompileAsCpp</CompileAs> <!-- We want to build Lua as C++ to get C++ name mangling -->
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>