diff --git a/plugins/LilyPad/Config.cpp b/plugins/LilyPad/Config.cpp
index d790eb8d0a..8fcc55938b 100644
--- a/plugins/LilyPad/Config.cpp
+++ b/plugins/LilyPad/Config.cpp
@@ -1,17 +1,9 @@
 #include "Global.h"
-#include <Dbt.h>
-#include <commctrl.h>
 
-#include "Config.h"
 #include "PS2Edefs.h"
 #include "Resource.h"
 #include "Diagnostics.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
 #include "DeviceEnumerator.h"
-#include "InputManager.h"
 #include "KeyboardQueue.h"
 #include "WndProcEater.h"
 #include "DualShock3.h"
diff --git a/plugins/LilyPad/Config.h b/plugins/LilyPad/Config.h
index ff8737330f..be5d96048a 100644
--- a/plugins/LilyPad/Config.h
+++ b/plugins/LilyPad/Config.h
@@ -1,9 +1,6 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#include "InputManager.h"
-#include "PS2Etypes.h"
-
 extern u8 ps2e;
 
 enum PadType {
diff --git a/plugins/LilyPad/DeviceEnumerator.cpp b/plugins/LilyPad/DeviceEnumerator.cpp
index ccd8dfecaa..cd41ce8fd7 100644
--- a/plugins/LilyPad/DeviceEnumerator.cpp
+++ b/plugins/LilyPad/DeviceEnumerator.cpp
@@ -1,6 +1,5 @@
 #include "Global.h"
 #include "DeviceEnumerator.h"
-#include "InputManager.h"
 #include "WindowsMessaging.h"
 #include "DirectInput.h"
 #include "KeyboardHook.h"
diff --git a/plugins/LilyPad/Diagnostics.cpp b/plugins/LilyPad/Diagnostics.cpp
index 07c2f3812a..6e19343fd9 100644
--- a/plugins/LilyPad/Diagnostics.cpp
+++ b/plugins/LilyPad/Diagnostics.cpp
@@ -1,10 +1,7 @@
 #include "Global.h"
-#include "InputManager.h"
 #include "DeviceEnumerator.h"
 #include "resource.h"
 #include "KeyboardQueue.h"
-#include <math.h>
-#include <commctrl.h>
 
 Device *dev;
 
diff --git a/plugins/LilyPad/DirectInput.cpp b/plugins/LilyPad/DirectInput.cpp
index 93d244d09b..540a340f46 100644
--- a/plugins/LilyPad/DirectInput.cpp
+++ b/plugins/LilyPad/DirectInput.cpp
@@ -1,13 +1,10 @@
-#define DIRECTINPUT_VERSION 0x0800
-
 #include "Global.h"
+
 #include "VKey.h"
 #include "DirectInput.h"
 #include <dinput.h>
-#include "InputManager.h"
 #include "DeviceEnumerator.h"
 #include "PS2Etypes.h"
-#include <stdio.h>
 
 // All for getting GUIDs of XInput devices....
 #include <wbemidl.h>
diff --git a/plugins/LilyPad/DirectInput.h b/plugins/LilyPad/DirectInput.h
index 9d263f7e5a..e206067020 100644
--- a/plugins/LilyPad/DirectInput.h
+++ b/plugins/LilyPad/DirectInput.h
@@ -1,3 +1 @@
-#include "InputManager.h"
-
 void EnumDirectInputDevices(int ignoreXInput);
diff --git a/plugins/LilyPad/DualShock3.cpp b/plugins/LilyPad/DualShock3.cpp
index 5a422242ad..fdc1cb8077 100644
--- a/plugins/LilyPad/DualShock3.cpp
+++ b/plugins/LilyPad/DualShock3.cpp
@@ -1,7 +1,6 @@
 #include "Global.h"
 #include "usb.h"
 #include "HidDevice.h"
-#include "InputManager.h"
 
 
 #define VID 0x054c
diff --git a/plugins/LilyPad/DualShock3.h b/plugins/LilyPad/DualShock3.h
index 97d7df3baa..1c46774d34 100644
--- a/plugins/LilyPad/DualShock3.h
+++ b/plugins/LilyPad/DualShock3.h
@@ -1,6 +1,5 @@
 int DualShock3Possible();
 void EnumDualShock3s();
-#include "InputManager.h"
 
 // May move elsewhere in the future.
 int InitLibUsb();
diff --git a/plugins/LilyPad/Global.cpp b/plugins/LilyPad/Global.cpp
new file mode 100644
index 0000000000..a57d59275b
--- /dev/null
+++ b/plugins/LilyPad/Global.cpp
@@ -0,0 +1 @@
+#include "Global.h"
diff --git a/plugins/LilyPad/Global.h b/plugins/LilyPad/Global.h
index 92543f5aae..ef2823822c 100644
--- a/plugins/LilyPad/Global.h
+++ b/plugins/LilyPad/Global.h
@@ -3,6 +3,8 @@
 // dll size by over 100k while avoiding any dependencies on updated CRT dlls.
 #pragma once
 
+#define DIRECTINPUT_VERSION 0x0800
+
 #ifdef NO_CRT
 #define _CRT_ALLOCATION_DEFINED
 #endif
@@ -27,6 +29,15 @@
 
 
 #include <windows.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+
+#include <commctrl.h>
+// Only needed for DBT_DEVNODES_CHANGED
+#include <Dbt.h>
+
 #include "PS2Etypes.h"
 #include "PS2Edefs.h"
 
@@ -66,7 +77,17 @@ EXPORT_C_(s32) PADfreeze(int mode, freezeData *data);
 EXPORT_C_(s32) PADsetSlot(u8 port, u8 slot);
 EXPORT_C_(s32) PADqueryMtap(u8 port);
 
+#include "InputManager.h"
+#include "Config.h"
 #ifdef NO_CRT
+
+#define malloc MyMalloc
+#define calloc MyCalloc
+#define free MyFree
+#define realloc MyRealloc
+#define wcsdup MyWcsdup
+#define wcsicmp MyWcsicmp
+
 inline void * malloc(size_t size) {
 	return HeapAlloc(GetProcessHeap(), 0, size);
 }
diff --git a/plugins/LilyPad/InputManager.cpp b/plugins/LilyPad/InputManager.cpp
index 43b82668d5..50d1b27151 100644
--- a/plugins/LilyPad/InputManager.cpp
+++ b/plugins/LilyPad/InputManager.cpp
@@ -1,7 +1,6 @@
-#include "InputManager.h"
 #include "Global.h"
+#include "InputManager.h"
 #include "KeyboardQueue.h"
-#include <math.h>
 
 InputDeviceManager *dm = 0;
 
diff --git a/plugins/LilyPad/KeyboardHook.cpp b/plugins/LilyPad/KeyboardHook.cpp
index d3c45d9897..b80dbc674a 100644
--- a/plugins/LilyPad/KeyboardHook.cpp
+++ b/plugins/LilyPad/KeyboardHook.cpp
@@ -1,9 +1,7 @@
 #include "Global.h"
 
 #include "KeyboardHook.h"
-#include "InputManager.h"
 #include "WindowsKeyboard.h"
-#include "Config.h"
 #include "VKey.h"
 #include "WndProcEater.h"
 #include "DeviceEnumerator.h"
diff --git a/plugins/LilyPad/KeyboardQueue.cpp b/plugins/LilyPad/KeyboardQueue.cpp
index 70badb83de..c8498ee119 100644
--- a/plugins/LilyPad/KeyboardQueue.cpp
+++ b/plugins/LilyPad/KeyboardQueue.cpp
@@ -1,3 +1,4 @@
+#include "Global.h"
 // This is undoubtedly completely unnecessary.
 #include "KeyboardQueue.h"
 
diff --git a/plugins/LilyPad/KeyboardQueue.h b/plugins/LilyPad/KeyboardQueue.h
index 3b8407be73..c5e44afad5 100644
--- a/plugins/LilyPad/KeyboardQueue.h
+++ b/plugins/LilyPad/KeyboardQueue.h
@@ -1,5 +1,3 @@
-#include "Global.h"
-#include "PS2Edefs.h"
 
 // This entire thing isn't really needed,
 // but takes little enough effort to be safe...
diff --git a/plugins/LilyPad/LilyPad.cpp b/plugins/LilyPad/LilyPad.cpp
index 646d7ce558..701a6744da 100644
--- a/plugins/LilyPad/LilyPad.cpp
+++ b/plugins/LilyPad/LilyPad.cpp
@@ -1,17 +1,10 @@
 #include "Global.h"
-#include <math.h>
-#include <Dbt.h>
-#include <stdio.h>
 
 // For escape timer, so as not to break GSDX+DX9.
 #include <time.h>
 
 #define PADdefs
-#include "PS2Etypes.h"
-#include "PS2Edefs.h"
 
-#include "Config.h"
-#include "InputManager.h"
 #include "DeviceEnumerator.h"
 #include "WndProcEater.h"
 #include "KeyboardQueue.h"
@@ -596,27 +589,26 @@ u32 CALLBACK PS2EgetLibVersion2(u32 type) {
 
 // Used in about and config screens.
 void GetNameAndVersionString(wchar_t *out) {
-#ifdef PCSX2_DEBUG
-	wsprintfW(out, L"LilyPad Debug %i.%i.%i (r%i)", (VERSION>>8)&0xFF, VERSION&0xFF, (VERSION>>24)&0xFF, SVN_REV);
-#elif (_MSC_VER != 1400)
+#ifdef NO_CRT
 	wsprintfW(out, L"LilyPad svn %i.%i.%i (r%i)", (VERSION>>8)&0xFF, VERSION&0xFF, (VERSION>>24)&0xFF, SVN_REV);
+#elif defined(PCSX2_DEBUG)
+	wsprintfW(out, L"LilyPad Debug %i.%i.%i (r%i)", (VERSION>>8)&0xFF, VERSION&0xFF, (VERSION>>24)&0xFF, SVN_REV);
 #else
 	wsprintfW(out, L"LilyPad %i.%i.%i", (VERSION>>8)&0xFF, VERSION&0xFF, (VERSION>>24)&0xFF, SVN_REV);
 #endif
 }
 
 char* CALLBACK PSEgetLibName() {
-#ifdef PCSX2_DEBUG
+#ifdef NO_CRT
+	return "LilyPad";
+#elif defined(PCSX2_DEBUG)
 	static char version[50];
 	sprintf(version, "LilyPad Debug (r%i)", SVN_REV);
 	return version;
 #else
-	#if (_MSC_VER != 1400)
-		static char version[50];
-		sprintf(version, "LilyPad svn (r%i)", SVN_REV);
-		return version;
-	#endif
-	return "LilyPad";
+	static char version[50];
+	sprintf(version, "LilyPad svn (r%i)", SVN_REV);
+	return version;
 #endif
 }
 
@@ -1412,18 +1404,6 @@ u32 CALLBACK PSEgetLibVersion() {
 	return (VERSION & 0xFFFFFF);
 }
 
-// Little funkiness to handle rounding floating points to ints without the C runtime.
-// Unfortunately, means I can't use /GL optimization option when NO_CRT is defined.
-#ifdef NO_CRT
-extern "C" long _cdecl _ftol();
-extern "C" long _cdecl _ftol2_sse() {
-	return _ftol();
-}
-extern "C" long _cdecl _ftol2() {
-	return _ftol();
-}
-#endif
-
 s32 CALLBACK PADqueryMtap(u8 port) {
 	port--;
 	if (port > 1) return 0;
@@ -1441,3 +1421,16 @@ s32 CALLBACK PADsetSlot(u8 port, u8 slot) {
 	// First slot always allowed.
 	return pads[port][slot].enabled | !slot;
 }
+
+// Little funkiness to handle rounding floating points to ints without the C runtime.
+// Unfortunately, means I can't use /GL optimization option when NO_CRT is defined.
+#ifdef NO_CRT
+extern "C" long _cdecl _ftol();
+extern "C" long _cdecl _ftol2_sse() {
+	return _ftol();
+}
+extern "C" long _cdecl _ftol2() {
+	return _ftol();
+}
+#endif
+
diff --git a/plugins/LilyPad/LilyPad_VC2005.sln b/plugins/LilyPad/LilyPad_VC2005.sln
deleted file mode 100644
index a5dc5d75fa..0000000000
--- a/plugins/LilyPad/LilyPad_VC2005.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LilyPad", "LilyPad_VC2005.vcproj", "{E4081455-398C-4610-A87C-90A8A7D72DC3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Debug|Win32.Build.0 = Debug|Win32
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Debug|x64.ActiveCfg = Debug|x64
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Debug|x64.Build.0 = Debug|x64
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Release|Win32.ActiveCfg = Release|Win32
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Release|Win32.Build.0 = Release|Win32
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Release|x64.ActiveCfg = Release|x64
-		{E4081455-398C-4610-A87C-90A8A7D72DC3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/plugins/LilyPad/LilyPad_VC2005.vcproj b/plugins/LilyPad/LilyPad_VC2005.vcproj
deleted file mode 100644
index 474764ddb9..0000000000
--- a/plugins/LilyPad/LilyPad_VC2005.vcproj
+++ /dev/null
@@ -1,764 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="LilyPad"
-	ProjectGUID="{E4081455-398C-4610-A87C-90A8A7D72DC3}"
-	RootNamespace="LilyPad"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/LilyPad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\common\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/LilyPad.pch"
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4995, 4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib setupapi.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
-				OutputFile="..\..\bin\plugins\$(ProjectName)-dbg.dll"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				ModuleDefinitionFile=".\LilyPad.def"
-				GenerateDebugInformation="true"
-				ImportLibrary=".\Debug/LilyPad.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/LilyPad.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Debug/LilyPad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4995, 4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib dinput8.lib dxguid.lib comctl32.lib"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\LilyPad.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/LilyPad.pdb"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/LilyPad.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/LilyPad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\..\common\include"
-				PreprocessorDefinitions="NO_CRT;WIN32;NDEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				RuntimeTypeInfo="false"
-				PrecompiledHeaderFile=".\Release/LilyPad.pch"
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CallingConvention="1"
-				DisableSpecificWarnings="4995, 4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="Winmm.lib ntdll.lib setupapi.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
-				OutputFile="..\..\bin\plugins\$(ProjectName).dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				IgnoreAllDefaultLibraries="true"
-				ModuleDefinitionFile=".\LilyPad.def"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				LinkTimeCodeGeneration="0"
-				EntryPointSymbol="DllMain"
-				ImportLibrary=".\Release/LilyPad.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				EmbedManifest="false"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/LilyPad.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				TypeLibraryName=".\Release/LilyPad.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="2"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="true"
-				FloatingPointModel="2"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CallingConvention="1"
-				DisableSpecificWarnings="4995, 4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib dinput8.lib dxguid.lib comctl32.lib"
-				OutputFile="$(OutDir)\$(ProjectName)64.dll"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ModuleDefinitionFile=".\LilyPad.def"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				EntryPointSymbol=""
-				BaseAddress="0x15000000"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/LilyPad.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="mt.exe -manifest $(IntDir)\LilyPad64.dll.manifest -outputresource:$(OutDir)\$(ProjectName)64.dll"
-				ExcludedFromBuild="true"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="Config.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						FavorSizeOrSpeed="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						FavorSizeOrSpeed="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="Config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Diagnostics.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Diagnostics.h"
-				>
-			</File>
-			<File
-				RelativePath="LilyPad.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						FavorSizeOrSpeed="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						FavorSizeOrSpeed="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="Global.h"
-				>
-			</File>
-			<File
-				RelativePath="PS2Edefs.h"
-				>
-			</File>
-			<File
-				RelativePath="PS2Etypes.h"
-				>
-			</File>
-			<File
-				RelativePath="resource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-			<File
-				RelativePath="frog.ico"
-				>
-			</File>
-			<File
-				RelativePath="LilyPad.def"
-				>
-			</File>
-			<File
-				RelativePath="LilyPad.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="InputAPIs"
-			>
-			<File
-				RelativePath=".\DirectInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\DirectInput.h"
-				>
-			</File>
-			<File
-				RelativePath=".\DualShock3.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\DualShock3.h"
-				>
-			</File>
-			<File
-				RelativePath=".\HidDevice.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\HidDevice.h"
-				>
-			</File>
-			<File
-				RelativePath=".\KeyboardHook.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\KeyboardHook.h"
-				>
-			</File>
-			<File
-				RelativePath=".\KeyboardQueue.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\KeyboardQueue.h"
-				>
-			</File>
-			<File
-				RelativePath=".\RawInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\RawInput.h"
-				>
-			</File>
-			<File
-				RelativePath=".\usb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WindowsKeyboard.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\WindowsKeyboard.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WindowsMessaging.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\WindowsMessaging.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WindowsMouse.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\WindowsMouse.h"
-				>
-			</File>
-			<File
-				RelativePath=".\XInput.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\XInput.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Input"
-			>
-			<File
-				RelativePath=".\DeviceEnumerator.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\DeviceEnumerator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\InputManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\InputManager.h"
-				>
-			</File>
-			<File
-				RelativePath="VKey.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						FavorSizeOrSpeed="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						FavorSizeOrSpeed="2"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="VKey.h"
-				>
-			</File>
-			<File
-				RelativePath=".\WndProcEater.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\WndProcEater.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/LilyPad/LilyPad_VC2008.vcproj b/plugins/LilyPad/LilyPad_VC2008.vcproj
index 037a6f92d1..c1fbce1b59 100644
--- a/plugins/LilyPad/LilyPad_VC2008.vcproj
+++ b/plugins/LilyPad/LilyPad_VC2008.vcproj
@@ -20,7 +20,6 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Debug.vsprops"
 			UseOfMFC="0"
@@ -44,13 +43,14 @@
 				MkTypLibCompatible="true"
 				SuppressStartupBanner="true"
 				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/LilyPad.tlb"
 				HeaderFileName=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				PreprocessorDefinitions="_USRDLL;TEST_EXPORTS"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
 				DisableSpecificWarnings="4995, 4996"
 			/>
 			<Tool
@@ -101,6 +101,89 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\common\vsprops\plugin_svnroot.vsprops;.\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\3rdpartyDeps.vsprops"
+			UseOfMFC="0"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4995, 4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib dinput8.lib dxguid.lib comctl32.lib"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="2"
@@ -133,6 +216,8 @@
 				Name="VCCLCompilerTool"
 				PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS"
 				ExceptionHandling="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
 				CallingConvention="1"
 				DisableSpecificWarnings="4995, 4996"
 			/>
@@ -183,90 +268,6 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets="..\..\common\vsprops\plugin_svnroot.vsprops;.\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\3rdpartyDeps.vsprops"
-			UseOfMFC="0"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="3"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				DisableSpecificWarnings="4995, 4996"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="odbc32.lib odbccp32.lib dinput8.lib dxguid.lib comctl32.lib"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="2"
@@ -311,6 +312,8 @@
 				BufferSecurityCheck="false"
 				EnableFunctionLevelLinking="true"
 				FloatingPointModel="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
 				WarningLevel="3"
 				SuppressStartupBanner="true"
 				CallingConvention="1"
@@ -361,7 +364,194 @@
 				Name="VCAppVerifierTool"
 			/>
 			<Tool
-				Name="VCWebDeploymentTool"
+				Name="VCPostBuildEventTool"
+				CommandLine="mt.exe -manifest $(IntDir)\LilyPad64.dll.manifest -outputresource:$(OutDir)\$(ProjectName)64.dll"
+				ExcludedFromBuild="true"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release No CRT|Win32"
+			ConfigurationType="2"
+			InheritedPropertySheets=".\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\CodeGen_Release.vsprops"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				WholeProgramOptimization="false"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;TEST_EXPORTS;NO_CRT"
+				ExceptionHandling="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
+				CallingConvention="1"
+				DisableSpecificWarnings="4995, 4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ntdll.lib Setupapi.lib Winmm.lib ole32.lib advapi32.lib user32.lib kernel32.lib Comdlg32.lib dinput8.lib dxguid.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)-no CRT.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				IgnoreAllDefaultLibraries="true"
+				ModuleDefinitionFile=".\LilyPad.def"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				LinkTimeCodeGeneration="0"
+				EntryPointSymbol="DllMain"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release No CRT|x64"
+			ConfigurationType="2"
+			InheritedPropertySheets="..\..\common\vsprops\plugin_svnroot.vsprops;.\ProjectRootDir.vsprops;..\..\common\vsprops\BaseProperties.vsprops;..\..\common\vsprops\3rdpartyDeps.vsprops"
+			UseOfMFC="0"
+			CharacterSet="2"
+			WholeProgramOptimization="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="true"
+				FavorSizeOrSpeed="2"
+				OmitFramePointers="true"
+				EnableFiberSafeOptimizations="true"
+				WholeProgramOptimization="false"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;TEST_EXPORTS"
+				StringPooling="true"
+				ExceptionHandling="0"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
+				EnableFunctionLevelLinking="true"
+				FloatingPointModel="2"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="Global.h"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CallingConvention="1"
+				DisableSpecificWarnings="4995, 4996"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib dinput8.lib dxguid.lib comctl32.lib"
+				OutputFile="$(OutDir)\$(ProjectName)64.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ModuleDefinitionFile=".\LilyPad.def"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				EntryPointSymbol=""
+				BaseAddress="0x15000000"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				SuppressStartupBanner="true"
+				OutputFile=".\Release No CRT/LilyPad.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
@@ -388,9 +578,26 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
@@ -399,15 +606,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release No CRT|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Release No CRT|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -440,9 +648,26 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
@@ -451,15 +676,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release No CRT|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Release No CRT|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -474,6 +700,58 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath=".\Global.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="Global.h"
 				>
@@ -506,14 +784,6 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions=""
-					/>
-				</FileConfiguration>
 				<FileConfiguration
 					Name="Debug|x64"
 					>
@@ -522,6 +792,14 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -530,6 +808,22 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release No CRT|x64"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
@@ -650,9 +944,26 @@
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|Win32"
 					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
 						Optimization="2"
@@ -661,15 +972,16 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release No CRT|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
+						Optimization="2"
 						PreprocessorDefinitions=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|x64"
+					Name="Release No CRT|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
diff --git a/plugins/LilyPad/RawInput.cpp b/plugins/LilyPad/RawInput.cpp
index e48ec8b081..1a401ab687 100644
--- a/plugins/LilyPad/RawInput.cpp
+++ b/plugins/LilyPad/RawInput.cpp
@@ -6,7 +6,6 @@
 #include "WindowsKeyboard.h"
 #include "WindowsMouse.h"
 
-#include "Config.h"
 
 typedef BOOL (CALLBACK *_RegisterRawInputDevices)(PCRAWINPUTDEVICE pRawInputDevices, UINT uiNumDevices, UINT cbSize);
 typedef UINT (CALLBACK *_GetRawInputDeviceInfo)(HANDLE hDevice, UINT uiCommand, LPVOID pData, PUINT pcbSize);
diff --git a/plugins/LilyPad/RawInput.h b/plugins/LilyPad/RawInput.h
index dc40e8ae7b..c63951d2b9 100644
--- a/plugins/LilyPad/RawInput.h
+++ b/plugins/LilyPad/RawInput.h
@@ -1,5 +1,3 @@
-#include "InputManager.h"
-
 // Can't enumerate raw devices, can only detect them when
 // receiving data from them, so just use the list from before.
 void EnumRawInputDevices();
diff --git a/plugins/LilyPad/VKey.cpp b/plugins/LilyPad/VKey.cpp
index 6e108e1a27..f1dd0216c7 100644
--- a/plugins/LilyPad/VKey.cpp
+++ b/plugins/LilyPad/VKey.cpp
@@ -1,6 +1,5 @@
-#include "VKey.h"
 #include "Global.h"
-#include <stdio.h>
+#include "VKey.h"
 
 wchar_t *GetVKStringW(unsigned char vk) {
 	int flag;
diff --git a/plugins/LilyPad/WindowsKeyboard.h b/plugins/LilyPad/WindowsKeyboard.h
index 938ec1dc0c..bff14e9418 100644
--- a/plugins/LilyPad/WindowsKeyboard.h
+++ b/plugins/LilyPad/WindowsKeyboard.h
@@ -1,5 +1,3 @@
-#include "InputManager.h"
-
 // Shared functionality for WM and RAW keyboards.
 class WindowsKeyboard : public Device {
 public:
diff --git a/plugins/LilyPad/WindowsMessaging.h b/plugins/LilyPad/WindowsMessaging.h
index 11957fda5d..8b96616381 100644
--- a/plugins/LilyPad/WindowsMessaging.h
+++ b/plugins/LilyPad/WindowsMessaging.h
@@ -1,3 +1 @@
-#include "InputManager.h"
-
 void EnumWindowsMessagingDevices();
diff --git a/plugins/LilyPad/WindowsMouse.h b/plugins/LilyPad/WindowsMouse.h
index 5fa5772c4a..938e2256d8 100644
--- a/plugins/LilyPad/WindowsMouse.h
+++ b/plugins/LilyPad/WindowsMouse.h
@@ -1,5 +1,3 @@
-#include "InputManager.h"
-
 // Shared functionality for WM and RAW keyboards.
 class WindowsMouse : public Device {
 public:
diff --git a/plugins/LilyPad/WndProcEater.cpp b/plugins/LilyPad/WndProcEater.cpp
index 27d27cbdeb..a79247e115 100644
--- a/plugins/LilyPad/WndProcEater.cpp
+++ b/plugins/LilyPad/WndProcEater.cpp
@@ -1,3 +1,4 @@
+#include "Global.h"
 #include "WndProcEater.h"
 
 static HWND hWndEaten = 0;
diff --git a/plugins/LilyPad/WndProcEater.h b/plugins/LilyPad/WndProcEater.h
index b85af1fd20..b6821a6324 100644
--- a/plugins/LilyPad/WndProcEater.h
+++ b/plugins/LilyPad/WndProcEater.h
@@ -1,5 +1,3 @@
-#include "Global.h"
-
 #define EATPROC_NO_UPDATE_WHILE_UPDATING_DEVICES	1
 
 /* Need this to let window be subclassed multiple times but still clean up nicely.
diff --git a/plugins/LilyPad/XInput.cpp b/plugins/LilyPad/XInput.cpp
index e24a0ed11e..1a25d9740b 100644
--- a/plugins/LilyPad/XInput.cpp
+++ b/plugins/LilyPad/XInput.cpp
@@ -1,7 +1,6 @@
 #include "Global.h"
 #include "VKey.h"
 #include <xinput.h>
-#include "InputManager.h"
 
 // This way, I don't require that XInput junk be installed.
 typedef void (CALLBACK *_XInputEnable)(BOOL enable);
diff --git a/plugins/LilyPad/usb.h b/plugins/LilyPad/usb.h
index b00591cec4..c6c5dca40e 100644
--- a/plugins/LilyPad/usb.h
+++ b/plugins/LilyPad/usb.h
@@ -3,9 +3,6 @@
 #ifndef __USB_H__
 #define __USB_H__
 
-#include <stdlib.h>
-#include <windows.h>
-
 /*
  * 'interface' is defined somewhere in the Windows header files. This macro
  * is deleted here to avoid conflicts and compile errors.