diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
new file mode 100644
index 00000000..284a6bc5
--- /dev/null
+++ b/Common/Common.vcxproj
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(SolutionDir)\Project.props" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{19312085-AA51-4BD6-BE92-4B6098CCA539}</ProjectGuid>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(SolutionDir)\Rainmeter.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup>
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="ControlTemplate.cpp" />
+    <ClCompile Include="Dialog.cpp" />
+    <ClCompile Include="MenuTemplate.cpp" />
+    <ClCompile Include="PathUtil.cpp" />
+    <ClCompile Include="Platform.cpp" />
+    <ClCompile Include="StringUtil.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ControlTemplate.h" />
+    <ClInclude Include="Dialog.h" />
+    <ClInclude Include="MenuTemplate.h" />
+    <ClInclude Include="PathUtil.h" />
+    <ClInclude Include="Platform.h" />
+    <ClInclude Include="RawString.h" />
+    <ClInclude Include="StringUtil.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
new file mode 100644
index 00000000..8f9d982b
--- /dev/null
+++ b/Common/Common.vcxproj.filters
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="Dialog.cpp" />
+    <ClCompile Include="MenuTemplate.cpp" />
+    <ClCompile Include="PathUtil.cpp" />
+    <ClCompile Include="Platform.cpp" />
+    <ClCompile Include="StringUtil.cpp" />
+    <ClCompile Include="ControlTemplate.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Dialog.h" />
+    <ClInclude Include="MenuTemplate.h" />
+    <ClInclude Include="PathUtil.h" />
+    <ClInclude Include="Platform.h" />
+    <ClInclude Include="RawString.h" />
+    <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="ControlTemplate.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Library/Library.vcxproj b/Library/Library.vcxproj
index 49731687..972f6478 100644
--- a/Library/Library.vcxproj
+++ b/Library/Library.vcxproj
@@ -66,8 +66,6 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\Common\ControlTemplate.cpp" />
-    <ClCompile Include="..\Common\Dialog.cpp" />
     <ClCompile Include="..\Common\Gfx\Canvas.cpp" />
     <ClCompile Include="..\Common\Gfx\CanvasD2D.cpp" />
     <ClCompile Include="..\Common\Gfx\CanvasGDIP.cpp" />
@@ -83,10 +81,6 @@
     <ClCompile Include="..\Common\Gfx\Util\WICBitmapDIB.cpp" />
     <ClCompile Include="..\Common\Gfx\Util\WICBitmapLockDIB.cpp" />
     <ClCompile Include="..\Common\Gfx\Util\WICBitmapLockGDIP.cpp" />
-    <ClCompile Include="..\Common\MenuTemplate.cpp" />
-    <ClCompile Include="..\Common\PathUtil.cpp" />
-    <ClCompile Include="..\Common\Platform.cpp" />
-    <ClCompile Include="..\Common\StringUtil.cpp" />
     <ClCompile Include="CommandHandler.cpp">
       <PrecompiledHeader>Use</PrecompiledHeader>
     </ClCompile>
@@ -298,8 +292,6 @@
     <ResourceCompile Include="Library.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\Common\ControlTemplate.h" />
-    <ClInclude Include="..\Common\Dialog.h" />
     <ClInclude Include="..\Common\Gfx\Canvas.h" />
     <ClInclude Include="..\Common\Gfx\CanvasD2D.h" />
     <ClInclude Include="..\Common\Gfx\CanvasGDIP.h" />
@@ -315,11 +307,6 @@
     <ClInclude Include="..\Common\Gfx\Util\WICBitmapDIB.h" />
     <ClInclude Include="..\Common\Gfx\Util\WICBitmapLockDIB.h" />
     <ClInclude Include="..\Common\Gfx\Util\WICBitmapLockGDIP.h" />
-    <ClInclude Include="..\Common\MenuTemplate.h" />
-    <ClInclude Include="..\Common\PathUtil.h" />
-    <ClInclude Include="..\Common\Platform.h" />
-    <ClInclude Include="..\Common\RawString.h" />
-    <ClInclude Include="..\Common\StringUtil.h" />
     <ClInclude Include="CommandHandler.h" />
     <ClInclude Include="ConfigParser.h" />
     <ClInclude Include="DialogAbout.h" />
@@ -401,6 +388,11 @@
   <ItemGroup>
     <None Include="Exports.def" />
   </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/Library/Library.vcxproj.filters b/Library/Library.vcxproj.filters
index 13bfbf56..e8bc7d8f 100644
--- a/Library/Library.vcxproj.filters
+++ b/Library/Library.vcxproj.filters
@@ -330,21 +330,6 @@
     <ClCompile Include="Section.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\Dialog.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\ControlTemplate.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\MenuTemplate.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\Platform.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Common\StringUtil.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
     <ClCompile Include="..\Common\Gfx\Canvas.cpp">
       <Filter>Common\Gfx</Filter>
     </ClCompile>
@@ -396,9 +381,6 @@
     <ClCompile Include="CommandHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Common\PathUtil.cpp">
-      <Filter>Common</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="ConfigParser.h">
@@ -626,21 +608,6 @@
     <ClInclude Include="Section.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\Dialog.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\ControlTemplate.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\MenuTemplate.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Platform.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\StringUtil.h">
-      <Filter>Common</Filter>
-    </ClInclude>
     <ClInclude Include="..\Common\Gfx\Canvas.h">
       <Filter>Common\Gfx</Filter>
     </ClInclude>
@@ -692,12 +659,6 @@
     <ClInclude Include="CommandHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Common\RawString.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\PathUtil.h">
-      <Filter>Common</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Library.rc">
diff --git a/Rainmeter.props b/Rainmeter.props
index 0cdb5a0e..15dfc0f0 100644
--- a/Rainmeter.props
+++ b/Rainmeter.props
@@ -25,6 +25,11 @@
     <IntDir>.\x64\$(Configuration)\</IntDir>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Avoid .lib files in TestBench. -->
+    <OutDir Condition="'$(ConfigurationType)'=='StaticLibrary'">$(IntDir)</OutDir>
+  </PropertyGroup>
+
   <ItemDefinitionGroup>
     <ClCompile>
       <!-- Set the version macros to 0x0601 (Win7) to avoid using Win8 specific features in the Win8 SDK. -->
diff --git a/Rainmeter.sln b/Rainmeter.sln
index b93581f8..a6b4e0a9 100644
--- a/Rainmeter.sln
+++ b/Rainmeter.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Application", "Application\Application.vcxproj", "{D2A0903C-E760-4134-AE61-3D55BF8F760C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{19312085-AA51-4BD6-BE92-4B6098CCA539}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Installer\Installer.vcxproj", "{2FCFBFD2-2720-4BDD-B620-4BDD3DBB8D3D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Language", "Language\Language.vcxproj", "{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}"
@@ -10,6 +12,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Library", "Library\Library.vcxproj", "{BE9D2400-7F1C-49D6-8498-5CE495491AD6}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A} = {6BE6F228-B741-4DA9-9FBC-E9F2A7BD483A}
+		{19312085-AA51-4BD6-BE92-4B6098CCA539} = {19312085-AA51-4BD6-BE92-4B6098CCA539}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SkinInstaller", "SkinInstaller\SkinInstaller.vcxproj", "{6F5D4C4A-C8C3-41DA-BF44-6D42B76464DA}"
@@ -76,6 +79,14 @@ Global
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|Win32.Build.0 = Release|Win32
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|x64.ActiveCfg = Release|x64
 		{D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|x64.Build.0 = Release|x64
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Debug|Win32.ActiveCfg = Debug|Win32
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Debug|Win32.Build.0 = Debug|Win32
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Debug|x64.ActiveCfg = Debug|x64
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Debug|x64.Build.0 = Debug|x64
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Release|Win32.ActiveCfg = Release|Win32
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Release|Win32.Build.0 = Release|Win32
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Release|x64.ActiveCfg = Release|x64
+		{19312085-AA51-4BD6-BE92-4B6098CCA539}.Release|x64.Build.0 = Release|x64
 		{2FCFBFD2-2720-4BDD-B620-4BDD3DBB8D3D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2FCFBFD2-2720-4BDD-B620-4BDD3DBB8D3D}.Debug|x64.ActiveCfg = Debug|Win32
 		{2FCFBFD2-2720-4BDD-B620-4BDD3DBB8D3D}.Release|Win32.ActiveCfg = Release|Win32