diff --git a/.gitignore b/.gitignore
index 836566f..c5f7935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 release/
 bin/
+.vs/
+*.vcxproj.user/
\ No newline at end of file
diff --git a/common/win32fix.h b/common/win32fix.h
index 7c06ef3..64f503b 100644
--- a/common/win32fix.h
+++ b/common/win32fix.h
@@ -16,11 +16,6 @@
 #define strncasecmp _strnicmp
 #define strcasecmp  _stricmp
 
-#define snprintf  _snprintf
-#if _MSC_VER < 1400 // AdamR: Ignore this definition in Visual Studio 2005 and later
-#define vsnprintf _vsnprintf
-#endif
-
 #define finite    _finite
 
 #define rotl      _rotl
diff --git a/hlbsp/hlbsp.vcproj b/hlbsp/hlbsp.vcproj
deleted file mode 100644
index 22bf291..0000000
--- a/hlbsp/hlbsp.vcproj
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="hlbsp"
-	ProjectGUID="{367AE0F7-CD4D-44E0-A2E2-34B9C6A3E51A}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release\hlbsp.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLBSP,VERSION_32BIT,NDEBUG,DOUBLEVEC_T,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\hlbsp.pch"
-				AssemblerListingLocation=".\Release\"
-				ObjectFile=".\Release\"
-				ProgramDataBaseFileName=".\Release\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release\hlbsp.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release\hlbsp.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release_x64"
-			IntermediateDirectory=".\Release_x64"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release_x64\hlbsp.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLBSP,VERSION_64BIT,NDEBUG,DOUBLEVEC_T,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release_x64\hlbsp.pch"
-				AssemblerListingLocation=".\Release_x64\"
-				ObjectFile=".\Release_x64\"
-				ProgramDataBaseFileName=".\Release_x64\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release_x64\hlbsp.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release_x64\hlbsp.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath=".\brink.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\merge.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\outside.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\portals.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\qbsp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\solidbsp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\surfaces.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\tjunc.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\writebsp.cpp"
-				>
-			</File>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\common\blockmem.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\bspfile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlinecfg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\filelib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\log.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\mathlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\messages.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\scriplib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\threads.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\winding.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="..\template\basictypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\blockmem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\boundingbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\bsp5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\bspfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlinecfg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\filelib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\hlassert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\messages.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\scriplib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\threads.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\win32fix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\winding.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/hlbsp/hlbsp.vcxproj b/hlbsp/hlbsp.vcxproj
index c01a56b..399b285 100644
--- a/hlbsp/hlbsp.vcxproj
+++ b/hlbsp/hlbsp.vcxproj
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <SccProjectName />
     <SccLocalPath />
+    <ProjectGuid>{E75CEB5E-EBAE-1E7D-A626-81604E140A5F}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/hlbsp/hlbsp.vcxproj.user b/hlbsp/hlbsp.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/hlbsp/hlbsp.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/hlcsg/hlcsg.vcproj b/hlcsg/hlcsg.vcproj
deleted file mode 100644
index 178b21d..0000000
--- a/hlcsg/hlcsg.vcproj
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="hlcsg"
-	ProjectGUID="{505681C2-3E57-300B-D330-46DD50C147D2}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release\hlcsg.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLCSG,VERSION_32BIT,NDEBUG,DOUBLEVEC_T,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\hlcsg.pch"
-				AssemblerListingLocation=".\Release\"
-				ObjectFile=".\Release\"
-				ProgramDataBaseFileName=".\Release\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release\hlcsg.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release\hlcsg.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release_x64"
-			IntermediateDirectory=".\Release_x64"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release_x64\hlcsg.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLCSG,VERSION_64BIT,NDEBUG,DOUBLEVEC_T,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release_x64\hlcsg.pch"
-				AssemblerListingLocation=".\Release_x64\"
-				ObjectFile=".\Release_x64\"
-				ProgramDataBaseFileName=".\Release_x64\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release_x64\hlcsg.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release_x64\hlcsg.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath=".\ansitoutf8.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\autowad.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\brush.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\brushunion.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\hullfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\map.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\properties.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\qcsg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\textures.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\wadcfg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\wadinclude.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\wadpath.cpp"
-				>
-			</File>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\common\blockmem.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\bspfile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlinecfg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\filelib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\log.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\mathlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\messages.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\scriplib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\threads.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\winding.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="..\template\basictypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\blockmem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\boundingbox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\bspfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlinecfg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\csg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\filelib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\hlassert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\messages.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\scriplib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\threads.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wadpath.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\win32fix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\winding.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/hlcsg/hlcsg.vcxproj b/hlcsg/hlcsg.vcxproj
index 695d35e..e1de03e 100644
--- a/hlcsg/hlcsg.vcxproj
+++ b/hlcsg/hlcsg.vcxproj
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <SccProjectName />
     <SccLocalPath />
+    <ProjectGuid>{505681C2-3E57-300B-D330-46DD50C147D2}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/hlcsg/hlcsg.vcxproj.user b/hlcsg/hlcsg.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/hlcsg/hlcsg.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/hlrad/hlrad.vcproj b/hlrad/hlrad.vcproj
deleted file mode 100644
index 9cb6722..0000000
--- a/hlrad/hlrad.vcproj
+++ /dev/null
@@ -1,413 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="hlrad"
-	ProjectGUID="{3B5F6C9B-1238-1ECF-14D8-01E4C3AB0EE1}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release\hlrad.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLRAD,VERSION_32BIT,NDEBUG,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\hlrad.pch"
-				AssemblerListingLocation=".\Release\"
-				ObjectFile=".\Release\"
-				ProgramDataBaseFileName=".\Release\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release\hlrad.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release\hlrad.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release_x64"
-			IntermediateDirectory=".\Release_x64"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release_x64\hlrad.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLRAD,VERSION_64BIT,NDEBUG,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release_x64\hlrad.pch"
-				AssemblerListingLocation=".\Release_x64\"
-				ObjectFile=".\Release_x64\"
-				ProgramDataBaseFileName=".\Release_x64\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release_x64\hlrad.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release_x64\hlrad.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath=".\compress.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lerp.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\lightmap.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\loadtextures.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\mathutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\nomatrix.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\qrad.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\qradutil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\sparse.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\trace.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\transfers.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\transparency.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\vismatrix.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\vismatrixutil.cpp"
-				>
-			</File>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\common\blockmem.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\bspfile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlinecfg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\filelib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\log.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\mathlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\messages.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\scriplib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\threads.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\winding.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="..\common\anorms.h"
-				>
-			</File>
-			<File
-				RelativePath="..\template\basictypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\blockmem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\boundingbox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\bspfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlinecfg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\compress.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\filelib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\hlassert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\messages.h"
-				>
-			</File>
-			<File
-				RelativePath=".\qrad.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\scriplib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\threads.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\win32fix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\winding.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/hlrad/hlrad.vcxproj b/hlrad/hlrad.vcxproj
index 41f37b6..039ee9e 100644
--- a/hlrad/hlrad.vcxproj
+++ b/hlrad/hlrad.vcxproj
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <SccProjectName />
     <SccLocalPath />
+    <ProjectGuid>{3B5F6C9B-1238-1ECF-14D8-01E4C3AB0EE1}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/hlrad/hlrad.vcxproj.user b/hlrad/hlrad.vcxproj.user
deleted file mode 100644
index 03f0546..0000000
--- a/hlrad/hlrad.vcxproj.user
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/hlvis/flow.cpp b/hlvis/flow.cpp
index 0254a61..03eac96 100644
--- a/hlvis/flow.cpp
+++ b/hlvis/flow.cpp
@@ -1,5 +1,9 @@
 #include "vis.h"
 
+#ifdef SYSTEM_WIN32
+#include <malloc.h>
+#endif
+
 // =====================================================================================
 //  CheckStack
 // =====================================================================================
diff --git a/hlvis/hlvis.vcproj b/hlvis/hlvis.vcproj
deleted file mode 100644
index 9bc51a8..0000000
--- a/hlvis/hlvis.vcproj
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="hlvis"
-	ProjectGUID="{76051CAC-5741-AF85-0C95-3A214F58D9AD}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release\hlvis.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLVIS,VERSION_32BIT,NDEBUG,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\hlvis.pch"
-				AssemblerListingLocation=".\Release\"
-				ObjectFile=".\Release\"
-				ProgramDataBaseFileName=".\Release\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release\hlvis.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release\hlvis.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release_x64"
-			IntermediateDirectory=".\Release_x64"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release_x64\hlvis.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="HLVIS,VERSION_64BIT,NDEBUG,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release_x64\hlvis.pch"
-				AssemblerListingLocation=".\Release_x64\"
-				ObjectFile=".\Release_x64\"
-				ProgramDataBaseFileName=".\Release_x64\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release_x64\hlvis.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release_x64\hlvis.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath=".\flow.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\vis.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\zones.cpp"
-				>
-			</File>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\common\blockmem.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\bspfile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlinecfg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\filelib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\log.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\mathlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\messages.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\scriplib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\threads.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\winding.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="..\template\basictypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\blockmem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\boundingbox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\bspfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlinecfg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\filelib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\hlassert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\messages.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\scriplib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\threads.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vis.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\win32fix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\winding.h"
-				>
-			</File>
-			<File
-				RelativePath=".\zones.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/hlvis/hlvis.vcxproj b/hlvis/hlvis.vcxproj
index ee5c4da..fe0ae62 100644
--- a/hlvis/hlvis.vcxproj
+++ b/hlvis/hlvis.vcxproj
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <SccProjectName />
     <SccLocalPath />
+    <ProjectGuid>{76051CAC-5741-AF85-0C95-3A214F58D9AD}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/hlvis/hlvis.vcxproj.filters b/hlvis/hlvis.vcxproj.filters
index d9213d9..d25d703 100644
--- a/hlvis/hlvis.vcxproj.filters
+++ b/hlvis/hlvis.vcxproj.filters
@@ -62,9 +62,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="C:\Program Files\Microsoft Visual Studio\VC98\Include\BASETSD.H">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\template\basictypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff --git a/hlvis/hlvis.vcxproj.user b/hlvis/hlvis.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/hlvis/hlvis.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/ripent/ripent.vcproj b/ripent/ripent.vcproj
deleted file mode 100644
index 8cf557d..0000000
--- a/ripent/ripent.vcproj
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="ripent"
-	ProjectGUID="{B057E5AD-13AF-2277-D7E0-2A7A16A9340F}"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release\ripent.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="RIPENT,VERSION_32BIT,NDEBUG,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release\ripent.pch"
-				AssemblerListingLocation=".\Release\"
-				ObjectFile=".\Release\"
-				ProgramDataBaseFileName=".\Release\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release\ripent.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release\ripent.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory=".\Release_x64"
-			IntermediateDirectory=".\Release_x64"
-			ConfigurationType="1"
-			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"
-				TypeLibraryName=".\Release_x64\ripent.tlb"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				InlineFunctionExpansion="0"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\common,..\template"
-				PreprocessorDefinitions="RIPENT,VERSION_64BIT,NDEBUG,WIN32,_CONSOLE,SYSTEM_WIN32,STDC_HEADERS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release_x64\ripent.pch"
-				AssemblerListingLocation=".\Release_x64\"
-				ObjectFile=".\Release_x64\"
-				ProgramDataBaseFileName=".\Release_x64\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				Optimization="2"
-				WholeProgramOptimization="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="binmode.obj"
-				OutputFile=".\Release_x64\ripent.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				SubSystem="1"
-				StackReserveSize="4194304"
-				StackCommitSize="1048576"
-				OptimizeForWindows98="2"
-				IgnoreAllDefaultLibraries="0"
-				EnableUAC="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release_x64\ripent.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath=".\ripent.cpp"
-				>
-			</File>
-			<Filter
-				Name="common"
-				>
-				<File
-					RelativePath="..\common\blockmem.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\bspfile.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\cmdlinecfg.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\filelib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\log.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\mathlib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\messages.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\scriplib.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\threads.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\common\winding.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;fi;fd"
-			>
-			<File
-				RelativePath="..\template\basictypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\blockmem.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\boundingbox.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\bspfile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\cmdlinecfg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\filelib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\hlassert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\log.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\mathtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\messages.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ripent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\scriplib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\threads.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\win32fix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\common\winding.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/ripent/ripent.vcxproj b/ripent/ripent.vcxproj
index bb7e251..9c39fa4 100644
--- a/ripent/ripent.vcxproj
+++ b/ripent/ripent.vcxproj
@@ -13,17 +13,20 @@
   <PropertyGroup Label="Globals">
     <SccProjectName />
     <SccLocalPath />
+    <ProjectGuid>{B057E5AD-13AF-2277-D7E0-2A7A16A9340F}</ProjectGuid>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/ripent/ripent.vcxproj.user b/ripent/ripent.vcxproj.user
deleted file mode 100644
index 695b5c7..0000000
--- a/ripent/ripent.vcxproj.user
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-</Project>
\ No newline at end of file
diff --git a/zhlt_vc2005.sln b/zhlt_vc2005.sln
deleted file mode 100644
index 99ea4f9..0000000
--- a/zhlt_vc2005.sln
+++ /dev/null
@@ -1,43 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlbsp", "hlbsp\hlbsp.vcproj", "{E75CEB5E-EBAE-1E7D-A626-81604E140A5F}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlcsg", "hlcsg\hlcsg.vcproj", "{505681C2-3E57-300B-D330-46DD50C147D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlrad", "hlrad\hlrad.vcproj", "{3B5F6C9B-1238-1ECF-14D8-01E4C3AB0EE1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hlvis", "hlvis\hlvis.vcproj", "{76051CAC-5741-AF85-0C95-3A214F58D9AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ripent", "ripent\ripent.vcproj", "{B057E5AD-13AF-2277-D7E0-2A7A16A9340F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E75CEB5E-EBAE-1E7D-A626-81604E140A5F}.Release|Win32.ActiveCfg = Release|Win32
-		{E75CEB5E-EBAE-1E7D-A626-81604E140A5F}.Release|Win32.Build.0 = Release|Win32
-		{E75CEB5E-EBAE-1E7D-A626-81604E140A5F}.Release|x64.ActiveCfg = Release|x64
-		{E75CEB5E-EBAE-1E7D-A626-81604E140A5F}.Release|x64.Build.0 = Release|x64
-		{505681C2-3E57-300B-D330-46DD50C147D2}.Release|Win32.ActiveCfg = Release|Win32
-		{505681C2-3E57-300B-D330-46DD50C147D2}.Release|Win32.Build.0 = Release|Win32
-		{505681C2-3E57-300B-D330-46DD50C147D2}.Release|x64.ActiveCfg = Release|x64
-		{505681C2-3E57-300B-D330-46DD50C147D2}.Release|x64.Build.0 = Release|x64
-		{3B5F6C9B-1238-1ECF-14D8-01E4C3AB0EE1}.Release|Win32.ActiveCfg = Release|Win32
-		{3B5F6C9B-1238-1ECF-14D8-01E4C3AB0EE1}.Release|Win32.Build.0 = Release|Win32
-		{3B5F6C9B-1238-1ECF-14D8-01E4C3AB0EE1}.Release|x64.ActiveCfg = Release|x64
-		{3B5F6C9B-1238-1ECF-14D8-01E4C3AB0EE1}.Release|x64.Build.0 = Release|x64
-		{76051CAC-5741-AF85-0C95-3A214F58D9AD}.Release|Win32.ActiveCfg = Release|Win32
-		{76051CAC-5741-AF85-0C95-3A214F58D9AD}.Release|Win32.Build.0 = Release|Win32
-		{76051CAC-5741-AF85-0C95-3A214F58D9AD}.Release|x64.ActiveCfg = Release|x64
-		{76051CAC-5741-AF85-0C95-3A214F58D9AD}.Release|x64.Build.0 = Release|x64
-		{B057E5AD-13AF-2277-D7E0-2A7A16A9340F}.Release|Win32.ActiveCfg = Release|Win32
-		{B057E5AD-13AF-2277-D7E0-2A7A16A9340F}.Release|Win32.Build.0 = Release|Win32
-		{B057E5AD-13AF-2277-D7E0-2A7A16A9340F}.Release|x64.ActiveCfg = Release|x64
-		{B057E5AD-13AF-2277-D7E0-2A7A16A9340F}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal