diff --git a/src/txt-converter/Makefile.in b/src/txt-converter/Makefile.in
index c90a6a4b21..41c773d31f 100644
--- a/src/txt-converter/Makefile.in
+++ b/src/txt-converter/Makefile.in
@@ -1,29 +1,77 @@
-
-LOGIN_CONVERTER_OBJ = obj_login/login-converter.o ../common/obj_all/minicore.o \
-	../common/obj_all/malloc.o ../common/obj_all/strlib.o ../common/obj_all/showmsg.o \
-	../common/obj_all/utils.o ../common/obj_all/ers.o ../common/obj_all/db.o \
+LOGIN_CONVERTER_OBJ = \
+	obj_login/login-converter.o \
+	../login/obj_txt/account_txt.o \
+	../login/obj_sql/account_sql.o \
+	../common/obj_all/minicore.o \
+	../common/obj_all/db.o \
+	../common/obj_all/ers.o \
+	../common/obj_all/lock.o \
+	../common/obj_all/malloc.o \
+	../common/obj_all/showmsg.o \
+	../common/obj_all/strlib.o \
+	../common/obj_all/timer.o \
 	../common/obj_sql/sql.o
-LOGIN_CONVERTER_H = ../common/cbasetypes.h ../common/mmo.h ../common/core.h \
-	../common/malloc.h ../common/strlib.h ../common/showmsg.h \
-	../common/utils.h ../common/ers.h ../common/db.h \
+LOGIN_CONVERTER_H = \
+	../login/account.h \
+	../common/cbasetypes.h \
+	../common/mmo.h \
+	../common/core.h \
+	../common/db.h \
+	../common/ers.h \
+	../common/lock.h \
+	../common/malloc.h \
+	../common/showmsg.h \
+	../common/strlib.h \
+	../common/timer.h \
 	../common/sql.h
 
-CHAR_CONVERTER_OBJ = obj_char/char-converter.o \
-	obj_char/txt-char.o obj_char/txt-int_pet.o obj_char/txt-int_storage.o obj_char/txt-inter.o \
-	obj_char/txt-int_party.o obj_char/txt-int_guild.o \
-	obj_char/sql-char.o obj_char/sql-int_pet.o obj_char/sql-int_storage.o \
-	obj_char/sql-inter.o obj_char/sql-int_party.o obj_char/sql-int_guild.o \
+CHAR_CONVERTER_OBJ = \
+	obj_char/char-converter.o \
+	obj_char/txt-char.o \
+	obj_char/txt-int_pet.o \
+	obj_char/txt-int_storage.o \
+	obj_char/txt-inter.o \
+	obj_char/txt-int_party.o \
+	obj_char/txt-int_guild.o \
+	obj_char/sql-char.o \
+	obj_char/sql-int_pet.o \
+	obj_char/sql-int_storage.o \
+	obj_char/sql-inter.o \
+	obj_char/sql-int_party.o \
+	obj_char/sql-int_guild.o \
 	../common/obj_all/minicore.o \
-	../common/obj_all/malloc.o ../common/obj_all/strlib.o ../common/obj_all/showmsg.o \
-	../common/obj_all/utils.o ../common/obj_all/ers.o ../common/obj_all/mapindex.o \
+	../common/obj_all/malloc.o \
+	../common/obj_all/strlib.o \
+	../common/obj_all/showmsg.o \
+	../common/obj_all/utils.o \
+	../common/obj_all/timer.o \
+	../common/obj_all/ers.o \
+	../common/obj_all/mapindex.o \
 	../common/obj_sql/sql.o
-CHAR_CONVERTER_H = ../char/char.h ../char/int_pet.h ../char/int_storage.h ../char/inter.h \
-	../char/int_party.h ../char/int_guild.h \
-	../char_sql/char.h ../char_sql/int_pet.h ../char_sql/int_storage.h \
-	../char_sql/inter.h ../char_sql/int_party.h ../char_sql/int_guild.h \
-	../common/cbasetypes.h ../common/mmo.h ../common/core.h \
-	../common/malloc.h ../common/strlib.h ../common/showmsg.h \
-	../common/utils.h ../common/ers.h ../common/mapindex.h \
+
+CHAR_CONVERTER_H = \
+	../char/char.h \
+	../char/int_pet.h \
+	../char/int_storage.h \
+	../char/inter.h \
+	../char/int_party.h \
+	../char/int_guild.h \
+	../char_sql/char.h \
+	../char_sql/int_pet.h \
+	../char_sql/int_storage.h \
+	../char_sql/inter.h \
+	../char_sql/int_party.h \
+	../char_sql/int_guild.h \
+	../common/cbasetypes.h \
+	../common/mmo.h \
+	../common/core.h \
+	../common/malloc.h \
+	../common/strlib.h \
+	../common/showmsg.h \
+	../common/timer.h \
+	../common/utils.h \
+	../common/ers.h \
+	../common/mapindex.h \
 	../common/sql.h
 
 HAVE_MYSQL=@HAVE_MYSQL@
@@ -72,7 +120,7 @@ obj_char:
 	-mkdir obj_char
 
 obj_login/%.o: %.c $(LOGIN_CONVERTER_H)
-	@CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -DTXT_SQL_CONVERT -c $(OUTPUT_OPTION) $<
+	@CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -DWITH_TXT -DWITH_SQL -c $(OUTPUT_OPTION) $<
 
 obj_char/%.o: %.c $(CHAR_CONVERTER_H)
 	@CC@ @CFLAGS@ @MYSQL_CFLAGS@ @CPPFLAGS@ -DTXT_SQL_CONVERT -c $(OUTPUT_OPTION) $<
@@ -89,3 +137,10 @@ obj_char/sql-%.o: ../char_sql/%.c $(CHAR_CONVERTER_H)
 
 ../common/obj_sql/%.o:
 	@$(MAKE) -C ../common sql
+
+# missing login server files
+../login/obj_txt/%.o:
+	@$(MAKE) -C ../login txt
+
+../login/obj_sql/%.o:
+	@$(MAKE) -C ../login sql
diff --git a/src/txt-converter/login-converter.c b/src/txt-converter/login-converter.c
index 78717287dd..d72d35ae28 100644
--- a/src/txt-converter/login-converter.c
+++ b/src/txt-converter/login-converter.c
@@ -1,9 +1,6 @@
 // (c) eAthena Dev Team - Licensed under GNU GPL
 // For more information, see LICENCE in the main folder
 
-#define WITH_TXT
-#define WITH_SQL
-
 #include "../common/cbasetypes.h"
 #include "../common/mmo.h" // struct mmo_account
 #include "../common/core.h"
diff --git a/tools/vs9-to-vs8.php b/tools/vs9-to-vs8.php
new file mode 100644
index 0000000000..aa88379ff8
--- /dev/null
+++ b/tools/vs9-to-vs8.php
@@ -0,0 +1,43 @@
+<?php
+	// Visual Studio 9 to Visual Studio 8 project file converter
+	// author : theultramage
+	// version: 4. august 2008
+?>
+<?php
+	echo "VS9 to VS8 project file converter"."\n";
+	echo "---------------------------------"."\n";
+	if( @$_SERVER["argc"] < 2 )
+	{
+		echo "Usage: {$_SERVER["argv"][0]} file.vcproj"."\n";
+		exit();
+	}
+
+	$input = @$_SERVER["argv"][1];
+	$data = file($input);
+	if( $data === FALSE )
+		die("invalid input file '".$input."'");
+
+	echo "Converting {$input}...";
+	
+	foreach( $data as $line )
+	{
+		if( strstr($line,'Version="9,00"') !== FALSE )
+			echo "\t".'Version="8,00"'."\n";
+		else
+		if( strstr($line,'Version="9.00"') !== FALSE )
+			echo "\t".'Version="8.00"'."\n";
+		else
+		if( strstr($line,'TargetFrameworkVersion') !== FALSE )
+			;
+		else
+		if( strstr($line,'RandomizedBaseAddress') !== FALSE )
+			;
+		else
+		if( strstr($line,'DataExecutionPrevention') !== FALSE )
+			;
+		else // default
+			echo $line;
+	}
+
+	echo "done."."\n";
+?>
diff --git a/vcproj-6/login-server_txt.dsp b/vcproj-6/login-server_txt.dsp
index f1d6047599..8982737891 100644
--- a/vcproj-6/login-server_txt.dsp
+++ b/vcproj-6/login-server_txt.dsp
@@ -38,7 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /D "ACCOUNTDB_ENGINE_0=rj" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c
+# ADD CPP /nologo /W2 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_WIN32" /D "__WIN32" /D FD_SETSIZE=4096 /D "DB_MANUAL_CAST_TO_UNION" /D "WITH_TXT" /Fp"tmp/login_txt/login-server_txt.pch" /YX /Fo"tmp/login_txt/" /Fd"tmp/login_txt/" /FD /c
 # ADD BASE RSC /l 0x409
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
diff --git a/vcproj-7.1/login-server_txt.vcproj b/vcproj-7.1/login-server_txt.vcproj
index 37086403cf..75c44a53b5 100644
--- a/vcproj-7.1/login-server_txt.vcproj
+++ b/vcproj-7.1/login-server_txt.vcproj
@@ -19,7 +19,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT;ACCOUNTDB_ENGINE_0=rj"
+				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="TRUE"
 				ExceptionHandling="FALSE"
@@ -92,7 +92,7 @@
 				EnableFiberSafeOptimizations="TRUE"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT;ACCOUNTDB_ENGINE_0=rj"
+				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
 				StringPooling="TRUE"
 				RuntimeLibrary="3"
 				DefaultCharIsUnsigned="FALSE"
diff --git a/vcproj-8/char-server_sql.vcproj b/vcproj-8/char-server_sql.vcproj
index 4d83d6c88f..a2f4814819 100644
--- a/vcproj-8/char-server_sql.vcproj
+++ b/vcproj-8/char-server_sql.vcproj
@@ -52,9 +52,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,9 +96,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -143,9 +140,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -169,7 +166,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -191,9 +187,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/char-server_txt.vcproj b/vcproj-8/char-server_txt.vcproj
index b18463c096..ac65295546 100644
--- a/vcproj-8/char-server_txt.vcproj
+++ b/vcproj-8/char-server_txt.vcproj
@@ -52,9 +52,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -95,9 +95,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -142,9 +139,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -167,7 +164,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -189,9 +185,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/ladmin.vcproj b/vcproj-8/ladmin.vcproj
index 43bd098ad4..645d75556e 100644
--- a/vcproj-8/ladmin.vcproj
+++ b/vcproj-8/ladmin.vcproj
@@ -51,7 +51,6 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
 			/>
@@ -95,9 +94,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -142,7 +138,6 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -167,7 +162,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -189,9 +183,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/login-server_sql.vcproj b/vcproj-8/login-server_sql.vcproj
index 07531ce61c..0afde87eb2 100644
--- a/vcproj-8/login-server_sql.vcproj
+++ b/vcproj-8/login-server_sql.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="login-server_sql"
 	ProjectGUID="{D356871D-58E1-450B-967A-E5E9646175AF}"
 	RootNamespace="login-server_sql"
@@ -52,9 +52,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,9 +96,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -145,9 +142,9 @@
 				PrecompiledHeaderThrough=""
 				PrecompiledHeaderFile=""
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -171,7 +168,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -193,9 +189,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/login-server_txt.vcproj b/vcproj-8/login-server_txt.vcproj
index 4ed7a7d611..fa454831f6 100644
--- a/vcproj-8/login-server_txt.vcproj
+++ b/vcproj-8/login-server_txt.vcproj
@@ -39,9 +39,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4100"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT;ACCOUNTDB_ENGINE_0=rj"
+				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
 				ExceptionHandling="0"
@@ -51,9 +50,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -95,9 +94,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -134,15 +130,15 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT;ACCOUNTDB_ENGINE_0=rj"
+				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION;WITH_TXT"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -165,7 +161,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -187,9 +182,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj
index 42abca3175..dede608414 100644
--- a/vcproj-8/map-server_sql.vcproj
+++ b/vcproj-8/map-server_sql.vcproj
@@ -39,7 +39,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -52,9 +51,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4018;4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,9 +95,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -129,7 +125,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100"
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
@@ -144,9 +139,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4018;4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -170,7 +165,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -192,9 +186,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj
index 0a017acdd1..dbaa045c01 100644
--- a/vcproj-8/map-server_txt.vcproj
+++ b/vcproj-8/map-server_txt.vcproj
@@ -39,7 +39,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\pcre\include"
 				PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -52,9 +51,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
+				DisableSpecificWarnings="4018;4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -96,9 +95,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -128,7 +124,6 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100"
 				Optimization="2"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
@@ -144,9 +139,9 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
+				DisableSpecificWarnings="4018;4100;4800"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -169,7 +164,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -191,9 +185,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/mapcache.vcproj b/vcproj-8/mapcache.vcproj
index 4e11d76d23..ca8ba377c7 100644
--- a/vcproj-8/mapcache.vcproj
+++ b/vcproj-8/mapcache.vcproj
@@ -51,7 +51,6 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
 			/>
@@ -95,9 +94,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -142,7 +138,6 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -167,7 +162,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -189,9 +183,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/vcproj-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj
index 608544d680..a30463c220 100644
--- a/vcproj-8/txt-converter-char.vcproj
+++ b/vcproj-8/txt-converter-char.vcproj
@@ -52,7 +52,6 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
 			/>
@@ -142,7 +141,6 @@
 				PrecompiledHeaderThrough=""
 				PrecompiledHeaderFile=""
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -168,7 +166,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -309,6 +306,14 @@
 				RelativePath="..\src\common\strlib.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\timer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\timer.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\utils.c"
 				>
diff --git a/vcproj-8/txt-converter-login.vcproj b/vcproj-8/txt-converter-login.vcproj
index da37608c8b..2fb4d62a57 100644
--- a/vcproj-8/txt-converter-login.vcproj
+++ b/vcproj-8/txt-converter-login.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8.00"
+	Version="8,00"
 	Name="txt-converter-login"
 	ProjectGUID="{D356871D-58E1-450B-967A-E9E9646175AF}"
 	RootNamespace="txt-converter-login"
@@ -52,7 +52,6 @@
 				DefaultCharIsUnsigned="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
 			/>
@@ -96,9 +95,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -145,7 +141,6 @@
 				PrecompiledHeaderThrough=""
 				PrecompiledHeaderFile=""
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="1"
 			/>
@@ -171,7 +166,6 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
 				LinkTimeCodeGeneration="1"
 				TargetMachine="1"
 			/>
@@ -193,9 +187,6 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -231,6 +222,14 @@
 				RelativePath="..\src\common\ers.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\lock.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\lock.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\common\malloc.c"
 				>
@@ -263,7 +262,27 @@
 				RelativePath="..\src\common\strlib.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\common\timer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common\timer.h"
+				>
+			</File>
 		</Filter>
+		<File
+			RelativePath="..\src\login\account.h"
+			>
+		</File>
+		<File
+			RelativePath="..\src\login\account_sql.c"
+			>
+		</File>
+		<File
+			RelativePath="..\src\login\account_txt.c"
+			>
+		</File>
 		<File
 			RelativePath="..\src\txt-converter\login-converter.c"
 			>