diff --git a/Common/MathParser.cpp b/Common/MathParser.cpp
index 4c69d0f7..ae827382 100644
--- a/Common/MathParser.cpp
+++ b/Common/MathParser.cpp
@@ -21,6 +21,8 @@
 #include "StdAfx.h"
 #include "MathParser.h"
 
+#include <string>
+
 namespace MathParser {
 
 static const double M_E = 2.7182818284590452354;
diff --git a/Common/StdAfx.h b/Common/StdAfx.h
index 0580642e..ab7af705 100644
--- a/Common/StdAfx.h
+++ b/Common/StdAfx.h
@@ -19,6 +19,9 @@
 #ifndef __STDAFX_H__
 #define __STDAFX_H__
 
+// Common is used by projects that don't link to msvcpNNN.dll at all so this header should include
+// only C compatible headers.
+
 #define _CRTDBG_MAP_ALLOC
 #include <crtdbg.h>
 
@@ -34,11 +37,8 @@
 #include <wincodec.h>
 #include <wrl/client.h>
 
-#include <cassert>
-#include <cmath>
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <vector>
+#include <assert.h>
+#include <math.h>
+#include <stdint.h>
 
 #endif
diff --git a/Installer/Installer.vcxproj b/Installer/Installer.vcxproj
index fba1de68..f54e3d55 100644
--- a/Installer/Installer.vcxproj
+++ b/Installer/Installer.vcxproj
@@ -26,9 +26,13 @@
     </Manifest>
     <ClCompile>
       <DisableSpecificWarnings>4800;4996</DisableSpecificWarnings>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\Common\ControlTemplate.cpp" />
+    <ClCompile Include="..\Common\Dialog.cpp" />
+    <ClCompile Include="..\Common\Platform.cpp" />
     <ClCompile Include="Application.cpp" />
     <ClCompile Include="DialogInstall.cpp" />
     <ClCompile Include="Install.cpp" />
@@ -74,11 +78,6 @@
   <ItemGroup>
     <ResourceCompile Include="Installer.rc" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.vcxproj">
-      <Project>{19312085-aa51-4bd6-be92-4b6098cca539}</Project>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/Installer/Installer.vcxproj.filters b/Installer/Installer.vcxproj.filters
index cb86fd7f..adc2ff29 100644
--- a/Installer/Installer.vcxproj.filters
+++ b/Installer/Installer.vcxproj.filters
@@ -16,6 +16,9 @@
     <Filter Include="lzma">
       <UniqueIdentifier>{9588f54f-9188-40b7-b750-260f5f514ee5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Common">
+      <UniqueIdentifier>{6acda1fa-eb7e-490b-ae49-ed7ff8b2534d}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Application.cpp">
@@ -78,6 +81,15 @@
     <ClCompile Include="DialogInstall.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\Common\Platform.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\ControlTemplate.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Common\Dialog.cpp">
+      <Filter>Common</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Application.h">