diff --git a/BlitzSteam/BlitzSteam.vcxproj b/BlitzSteam/BlitzSteam.vcxproj
index f42de66..e6d4c1f 100644
--- a/BlitzSteam/BlitzSteam.vcxproj
+++ b/BlitzSteam/BlitzSteam.vcxproj
@@ -40,16 +40,18 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\Build\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\Build\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
     <TargetExt>.dll</TargetExt>
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -70,14 +72,14 @@
       <CompileAsManaged>false</CompileAsManaged>
       <CompileAsWinRT>false</CompileAsWinRT>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <CreateHotpatchableImage>true</CreateHotpatchableImage>
-      <RuntimeTypeInfo>
-      </RuntimeTypeInfo>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <OpenMPSupport>false</OpenMPSupport>
       <ForcedIncludeFiles>
       </ForcedIncludeFiles>
       <MinimalRebuild>false</MinimalRebuild>
+      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -96,7 +98,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Full</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>
       </SDLCheck>
@@ -110,14 +112,14 @@
       <CompileAsManaged>false</CompileAsManaged>
       <CompileAsWinRT>false</CompileAsWinRT>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
-      <CreateHotpatchableImage>true</CreateHotpatchableImage>
-      <RuntimeTypeInfo>
-      </RuntimeTypeInfo>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <OpenMPSupport>false</OpenMPSupport>
       <ForcedIncludeFiles>
       </ForcedIncludeFiles>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <MinimalRebuild>false</MinimalRebuild>
+      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>false</GenerateDebugInformation>
diff --git a/BlitzUtility/BlitzUtility.vcxproj b/BlitzUtility/BlitzUtility.vcxproj
index 300466a..5ae5c0e 100644
--- a/BlitzUtility/BlitzUtility.vcxproj
+++ b/BlitzUtility/BlitzUtility.vcxproj
@@ -39,14 +39,16 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)\Build\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)\Build\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)\Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)\#Build\$(ProjectName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)\#Intermediate\$(ProjectName)\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
+    <IncludePath>$(ProjectDir);$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -63,15 +65,15 @@
       <ForcedIncludeFiles>
       </ForcedIncludeFiles>
       <OpenMPSupport>false</OpenMPSupport>
-      <RuntimeTypeInfo>
-      </RuntimeTypeInfo>
-      <CreateHotpatchableImage>true</CreateHotpatchableImage>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
       <CompileAsManaged>false</CompileAsManaged>
       <MinimalRebuild>false</MinimalRebuild>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -100,15 +102,15 @@
       </ForcedIncludeFiles>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <OpenMPSupport>false</OpenMPSupport>
-      <RuntimeTypeInfo>
-      </RuntimeTypeInfo>
-      <CreateHotpatchableImage>true</CreateHotpatchableImage>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <CreateHotpatchableImage>false</CreateHotpatchableImage>
       <MinimalRebuild>false</MinimalRebuild>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
       <MultiProcessorCompilation>false</MultiProcessorCompilation>
       <CompileAsManaged>false</CompileAsManaged>
       <CompileAsWinRT>false</CompileAsWinRT>
+      <CallingConvention>StdCall</CallingConvention>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -138,9 +140,14 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Containers\BlitzList.cpp" />
+    <ClCompile Include="Database\SQLite\sqlite3.c">
+      <CallingConvention Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Cdecl</CallingConvention>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsC</CompileAs>
+      <CallingConvention Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Cdecl</CallingConvention>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsC</CompileAs>
+    </ClCompile>
     <ClCompile Include="Utility\Indexer.cpp" />
     <ClCompile Include="Database\SQLite\SQLite.cpp" />
-    <ClCompile Include="Database\SQLite\sqlite3.c" />
     <ClCompile Include="Math\Matrix3.cpp" />
     <ClCompile Include="Math\Vector3.cpp" />
     <ClCompile Include="Math\Vector2.cpp" />
diff --git a/BlitzUtility/BlitzUtility.vcxproj.filters b/BlitzUtility/BlitzUtility.vcxproj.filters
index b7f0490..b3b4796 100644
--- a/BlitzUtility/BlitzUtility.vcxproj.filters
+++ b/BlitzUtility/BlitzUtility.vcxproj.filters
@@ -31,9 +31,6 @@
     <ClCompile Include="Database\SQLite\SQLite.cpp">
       <Filter>Source Files\Database\SQLite</Filter>
     </ClCompile>
-    <ClCompile Include="Database\SQLite\sqlite3.c">
-      <Filter>Source Files\Database\SQLite</Filter>
-    </ClCompile>
     <ClCompile Include="Math\Matrix3.cpp">
       <Filter>Source Files\Math</Filter>
     </ClCompile>
@@ -52,6 +49,9 @@
     <ClCompile Include="Utility\WindowMessageHandler.cpp">
       <Filter>Source Files\Utility</Filter>
     </ClCompile>
+    <ClCompile Include="Database\SQLite\sqlite3.c">
+      <Filter>Source Files\Database\SQLite</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="dllmain.h">
diff --git a/BlitzUtility/Database/SQLite/sqlite3.c b/BlitzUtility/Database/SQLite/sqlite3.c
index 8f74be1..66fbec6 100644
--- a/BlitzUtility/Database/SQLite/sqlite3.c
+++ b/BlitzUtility/Database/SQLite/sqlite3.c
@@ -262,7 +262,7 @@ extern "C" {
 # define SQLITE_CDECL
 #endif
 #ifndef SQLITE_STDCALL
-# define SQLITE_STDCALL
+# define SQLITE_STDCALL __cdecl
 #endif
 
 /*
diff --git a/BlitzUtility/Database/SQLite/sqlite3.h b/BlitzUtility/Database/SQLite/sqlite3.h
index 035b948..5039b75 100644
--- a/BlitzUtility/Database/SQLite/sqlite3.h
+++ b/BlitzUtility/Database/SQLite/sqlite3.h
@@ -55,7 +55,7 @@ extern "C" {
 # define SQLITE_CDECL
 #endif
 #ifndef SQLITE_STDCALL
-# define SQLITE_STDCALL
+# define SQLITE_STDCALL __cdecl
 #endif
 
 /*
diff --git a/BlitzUtility/Utility/WindowMessageHandler.cpp b/BlitzUtility/Utility/WindowMessageHandler.cpp
index 5407b91..63dd4c1 100644
--- a/BlitzUtility/Utility/WindowMessageHandler.cpp
+++ b/BlitzUtility/Utility/WindowMessageHandler.cpp
@@ -52,6 +52,7 @@ DLL_EXPORT void WindowMessageHandler_Install(HWND hwnd) {
 		UserData->oUserData = SetWindowLong(hwnd, GWL_USERDATA, (LONG)UserData);
 	}
 }
+#pragma comment(linker, "/EXPORT:WindowMessageHandler_Install=_WindowMessageHandler_Install@4")
 
 DLL_EXPORT void WindowMessageHandler_Uninstall(HWND hwnd) {
 	if (hwnd) {
@@ -63,6 +64,7 @@ DLL_EXPORT void WindowMessageHandler_Uninstall(HWND hwnd) {
 		}
 	}
 }
+#pragma comment(linker, "/EXPORT:WindowMessageHandler_Uninstall=_WindowMessageHandler_Uninstall@4")
 
 DLL_EXPORT int WindowMessageHandler_Message_Resize(HWND hwnd, LPPOINT point) {
 	if (hwnd) {
@@ -77,6 +79,7 @@ DLL_EXPORT int WindowMessageHandler_Message_Resize(HWND hwnd, LPPOINT point) {
 	}
 	return 0;
 }
+#pragma comment(linker, "/EXPORT:WindowMessageHandler_Message_Resize=_WindowMessageHandler_Message_Resize@8")
 
 DLL_EXPORT int WindowMessageHandler_Message_Destroy(HWND hwnd) {
 	if (hwnd) {
@@ -89,6 +92,7 @@ DLL_EXPORT int WindowMessageHandler_Message_Destroy(HWND hwnd) {
 	}
 	return 0;
 }
+#pragma comment(linker, "/EXPORT:WindowMessageHandler_Message_Destroy=_WindowMessageHandler_Message_Destroy@4")
 
 DLL_EXPORT int WindowMessageHandler_Message_Close(HWND hwnd) {
 	if (hwnd) {
@@ -101,4 +105,5 @@ DLL_EXPORT int WindowMessageHandler_Message_Close(HWND hwnd) {
 	}
 	return 0;
 }
+#pragma comment(linker, "/EXPORT:WindowMessageHandler_Message_Close=_WindowMessageHandler_Message_Close@4")