From 8a04f13c867740dce10fb4e683dbeaa8db5d334c Mon Sep 17 00:00:00 2001
From: brain
Date: Wed, 17 Sep 2008 22:08:50 +0000
Subject: Merge vc90 update patch from IronLegend, thanks

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10555 e03df62e-2008-0410-955e-edbf42e46eb7
---
 win/configure.cpp             |  16 +-
 win/configureVC90.vcproj      |  11 +-
 win/inspircdVC90.vcproj       | 936 ++++++++++++++++++++++++++++++++++++------
 win/m_spanningtreeVC90.vcproj |  34 +-
 4 files changed, 847 insertions(+), 150 deletions(-)

(limited to 'win')

diff --git a/win/configure.cpp b/win/configure.cpp
index bd985bc24..0eaa73e3f 100644
--- a/win/configure.cpp
+++ b/win/configure.cpp
@@ -515,13 +515,13 @@ void WriteCompileCommands()
 #ifdef WIN64
 	// /MACHINE:X64
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\debug", NULL);
 		CreateDirectory("..\\bin\\debug\\bin", NULL);
 		CreateDirectory("..\\bin\\debug\\lib", NULL);
 		CreateDirectory("..\\bin\\debug\\modules", NULL);
 	#else
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release_x64\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\lib\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\release", NULL);
 		CreateDirectory("..\\bin\\release\\bin", NULL);
 		CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -529,13 +529,13 @@ void WriteCompileCommands()
 	#endif
 #else
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\debug\\lib\\$*.so\" /PDB:\"..\\..\\bin\\debug\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\debug", NULL);
 		CreateDirectory("..\\bin\\debug\\bin", NULL);
 		CreateDirectory("..\\bin\\debug\\lib", NULL);
 		CreateDirectory("..\\bin\\debug\\modules", NULL);
 	#else
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\lib\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/commands\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib /OUT:\"..\\..\\bin\\release\\lib\\$*.so\" /PDB:\"..\\..\\bin\\release\\lib\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\lib\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\release", NULL);
 		CreateDirectory("..\\bin\\release\\bin", NULL);
 		CreateDirectory("..\\bin\\release\\lib", NULL);
@@ -596,21 +596,21 @@ void WriteCompileModules()
 #ifdef WIN64
 	// /MACHINE:X64
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\debug_x64\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\debug_x64", NULL);
 	#else
-		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release_x64\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release_x64\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release_x64\\modules\\$*.pdb\" /MACHINE:X64 /IMPLIB:\"..\\..\\bin\\release_x64\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\release_x64", NULL);
 	#endif
 #else
 	#ifdef _DEBUG
-		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_DEBUG\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /Gm /EHsc /Gm /RTC1 /MDd /Fo\"Debug/\" /Fd\"Debug/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\debug\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\debug\\modules\\$*.so\" /PDB:\"..\\..\\bin\\debug\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\debug\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\debug", NULL);
 		CreateDirectory("..\\src\\modules\\debug\\lib", NULL);
 		CreateDirectory("..\\src\\modules\\debug\\modules", NULL);
 		CreateDirectory("..\\src\\modules\\debug\\bin", NULL);
 	#else
-		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Wp64 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");
+		fprintf(f, "  cl /nologo -Dssize_t=long /LD /Od /I \".\" /I \"../../include\" /I \"../../include/modes\" /I \"../../include/modules\" /I \"../../win\" /D \"WIN32\" /D \"_CONSOLE\" /D \"_MBCS\" /D \"DLL_BUILD\" /EHsc /Gm /GL /MD /Fo\"Release/\" /Fd\"Release/vc70.pdb\" /W2 /Zi /TP $*.cpp ..\\..\\win\\inspircd_memory_functions.cpp /link ..\\..\\bin\\release\\bin\\inspircd.lib ws2_32.lib /OUT:\"..\\..\\bin\\release\\modules\\$*.so\" /PDB:\"..\\..\\bin\\release\\modules\\$*.pdb\" /IMPLIB:\"..\\..\\bin\\release\\modules\\$*.lib\"\n\n");
 		CreateDirectory("..\\src\\modules\\release", NULL);
 		CreateDirectory("..\\src\\modules\\release\\lib", NULL);
 		CreateDirectory("..\\src\\modules\\release\\modules", NULL);
diff --git a/win/configureVC90.vcproj b/win/configureVC90.vcproj
index 0fed898f4..c9c9755c9 100644
--- a/win/configureVC90.vcproj
+++ b/win/configureVC90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="configure"
 	ProjectGUID="{B922B569-727E-4EB0-827A-04E133A91DE7}"
 	RootNamespace="configure"
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="."
-			IntermediateDirectory="Debug_configureVc80"
+			IntermediateDirectory="Debug_configureVc90"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -200,7 +200,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
+				AdditionalOptions="/I:&quot;include&quot;"
+				Optimization="0"
 				WholeProgramOptimization="true"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				MinimalRebuild="true"
@@ -208,7 +209,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -224,7 +225,7 @@
 				AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
 				OutputFile="$(OutDir)/configure.exe"
 				LinkIncremental="1"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/win/inspircdVC90.vcproj b/win/inspircdVC90.vcproj
index 1cccd0029..74e1e754a 100644
--- a/win/inspircdVC90.vcproj
+++ b/win/inspircdVC90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="inspircd"
 	ProjectGUID="{FE82A6FC-41C7-4CB1-AA46-6DBCB6C682C8}"
 	RootNamespace="inspircd"
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="..\bin\debug\bin"
-			IntermediateDirectory="DebugVc80"
+			IntermediateDirectory="DebugVc90"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -69,7 +69,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
+				AdditionalDependencies="psapi.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
 				ShowProgress="0"
 				OutputFile="$(OutDir)/inspircd.exe"
 				LinkIncremental="1"
@@ -240,11 +240,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="dbghelp.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
+				AdditionalDependencies="psapi.lib ws2_32.lib mswsock.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
 				OutputFile="$(OutDir)/inspircd.exe"
 				LinkIncremental="1"
 				EmbedManagedResourceFile="inspircd.ico"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -384,6 +384,10 @@
 				RelativePath="..\src\channels.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\cidr.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\command_parse.cpp"
 				>
@@ -424,6 +428,10 @@
 				RelativePath="..\src\inspircd.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\inspircd_namedpipe.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\inspsocket.cpp"
 				>
@@ -432,6 +440,10 @@
 				RelativePath="..\src\inspstring.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\listensocket.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\logger.cpp"
 				>
@@ -516,6 +528,10 @@
 				RelativePath="..\src\wildcard.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\win32service.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\xline.cpp"
 				>
@@ -578,10 +594,6 @@
 				RelativePath="..\include\configreader.h"
 				>
 			</File>
-			<File
-				RelativePath="..\include\connection.h"
-				>
-			</File>
 			<File
 				RelativePath="..\include\ctables.h"
 				>
@@ -626,6 +638,10 @@
 				RelativePath="..\include\inspircd_config.h"
 				>
 			</File>
+			<File
+				RelativePath=".\inspircd_namedpipe.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\inspsocket.h"
 				>
@@ -646,6 +662,10 @@
 				RelativePath="..\include\modules.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\numerics.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\snomasks.h"
 				>
@@ -706,10 +726,230 @@
 				RelativePath="..\include\wildcard.h"
 				>
 			</File>
+			<File
+				RelativePath=".\win32service.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\xline.h"
 				>
 			</File>
+			<Filter
+				Name="commands"
+				>
+				<File
+					RelativePath="..\include\commands\cmd_admin.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_away.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_clearcache.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_commands.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_connect.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_die.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_eline.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_gline.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_info.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_invite.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_ison.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_join.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_kick.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_kill.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_kline.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_links.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_list.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_loadmodule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_lusers.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_map.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_mode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_modules.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_motd.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_names.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_nick.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_notice.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_oper.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_part.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_pass.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_ping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_pong.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_privmsg.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_qline.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_quit.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_rehash.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_reloadmodule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_restart.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_rules.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_server.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_squit.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_stats.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_time.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_topic.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_trace.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_unloadmodule.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_user.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_userhost.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_version.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_wallops.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_who.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_whois.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_whowas.h"
+					>
+				</File>
+				<File
+					RelativePath="..\include\commands\cmd_zline.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="modes"
@@ -766,10 +1006,6 @@
 				RelativePath="..\src\modes\umode_i.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\modes\umode_n.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\modes\umode_o.cpp"
 				>
@@ -787,14 +1023,414 @@
 			Name="Modules"
 			>
 			<File
-				RelativePath="..\src\modules\httpclient.h"
+				RelativePath="..\src\modules\account.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\httpclient.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\httpd.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_abbreviation.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_alias.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_alltime.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_antibear.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_antibottler.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_auditorium.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_banexception.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_banredirect.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_blockamsg.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_blockcaps.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_blockcolor.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_botmode.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_callerid.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_cap.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_cap.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_cban.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_censor.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\modules\m_cgiirc.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -802,19 +1438,19 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\httpd.h"
+				RelativePath="..\src\modules\m_chancreate.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -822,12 +1458,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_alias.cpp"
+				RelativePath="..\src\modules\m_chanfilter.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -847,7 +1483,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_alltime.cpp"
+				RelativePath="..\src\modules\m_chanlog.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -867,7 +1503,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_antibear.cpp"
+				RelativePath="..\src\modules\m_channelban.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -887,7 +1523,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_antibottler.cpp"
+				RelativePath="..\src\modules\m_chanprotect.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -907,7 +1543,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_auditorium.cpp"
+				RelativePath="..\src\modules\m_check.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -927,7 +1563,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_banexception.cpp"
+				RelativePath="..\src\modules\m_chghost.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -947,7 +1583,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_banredirect.cpp"
+				RelativePath="..\src\modules\m_chgident.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -967,7 +1603,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_blockamsg.cpp"
+				RelativePath="..\src\modules\m_chgname.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -987,7 +1623,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_blockcaps.cpp"
+				RelativePath="..\src\modules\m_cloaking.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1007,7 +1643,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_blockcolor.cpp"
+				RelativePath="..\src\modules\m_clones.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1027,7 +1663,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_botmode.cpp"
+				RelativePath="..\src\modules\m_close.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1047,7 +1683,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_callerid.cpp"
+				RelativePath="..\src\modules\m_commonchans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1067,7 +1703,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_cban.cpp"
+				RelativePath="..\src\modules\m_conn_join.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1087,7 +1723,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_censor.cpp"
+				RelativePath="..\src\modules\m_conn_umodes.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1107,7 +1743,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_cgiirc.cpp"
+				RelativePath="..\src\modules\m_conn_waitpong.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1127,7 +1763,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chancreate.cpp"
+				RelativePath="..\src\modules\m_connectban.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1147,7 +1783,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chanfilter.cpp"
+				RelativePath="..\src\modules\m_connflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1167,7 +1803,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chanprotect.cpp"
+				RelativePath="..\src\modules\m_customtitle.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1187,7 +1823,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_check.cpp"
+				RelativePath="..\src\modules\m_cycle.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1207,7 +1843,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chghost.cpp"
+				RelativePath="..\src\modules\m_dccallow.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1227,7 +1863,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chgident.cpp"
+				RelativePath="..\src\modules\m_deaf.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1247,7 +1883,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_chgname.cpp"
+				RelativePath="..\src\modules\m_delayjoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1267,7 +1903,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_cloaking.cpp"
+				RelativePath="..\src\modules\m_denychans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1287,7 +1923,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_clones.cpp"
+				RelativePath="..\src\modules\m_devoice.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1307,7 +1943,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_close.cpp"
+				RelativePath="..\src\modules\m_dnsbl.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1327,7 +1963,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_commonchans.cpp"
+				RelativePath="..\src\modules\m_filter.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1347,14 +1983,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_conn_join.cpp"
+				RelativePath="..\src\modules\m_filter.h"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1362,12 +1998,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_conn_umodes.cpp"
+				RelativePath="..\src\modules\m_foobar.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1387,7 +2023,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_conn_waitpong.cpp"
+				RelativePath="..\src\modules\m_gecosban.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1407,7 +2043,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_connflood.cpp"
+				RelativePath="..\src\modules\m_globalload.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1427,7 +2063,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_customtitle.cpp"
+				RelativePath="..\src\modules\m_globops.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1447,14 +2083,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_cycle.cpp"
+				RelativePath="..\src\modules\m_hash.h"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1462,12 +2098,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCLCompilerTool"
+						Name="VCCustomBuildTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_dccallow.cpp"
+				RelativePath="..\src\modules\m_helpop.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1487,7 +2123,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_deaf.cpp"
+				RelativePath="..\src\modules\m_hidechans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1507,7 +2143,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_denychans.cpp"
+				RelativePath="..\src\modules\m_hideoper.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1527,7 +2163,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_devoice.cpp"
+				RelativePath="..\src\modules\m_hostchange.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1547,7 +2183,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_dnsbl.cpp"
+				RelativePath="..\src\modules\m_httpd.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1567,7 +2203,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_filter.cpp"
+				RelativePath="..\src\modules\m_httpd_acl.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1587,14 +2223,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_filter.h"
+				RelativePath="..\src\modules\m_httpd_config.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1602,12 +2238,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_foobar.cpp"
+				RelativePath="..\src\modules\m_httpd_stats.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1627,7 +2263,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_globalload.cpp"
+				RelativePath="..\src\modules\m_ident.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1647,7 +2283,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_globops.cpp"
+				RelativePath="..\src\modules\m_invisible.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1667,14 +2303,14 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hash.h"
+				RelativePath="..\src\modules\m_inviteexception.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1682,12 +2318,12 @@
 					ExcludedFromBuild="true"
 					>
 					<Tool
-						Name="VCCustomBuildTool"
+						Name="VCCLCompilerTool"
 					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_helpop.cpp"
+				RelativePath="..\src\modules\m_joinflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1707,7 +2343,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hidechans.cpp"
+				RelativePath="..\src\modules\m_jumpserver.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1727,7 +2363,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hideoper.cpp"
+				RelativePath="..\src\modules\m_kicknorejoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1747,7 +2383,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_hostchange.cpp"
+				RelativePath="..\src\modules\m_knock.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1767,7 +2403,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_httpd.cpp"
+				RelativePath="..\src\modules\m_lockserv.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1787,7 +2423,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_httpd_stats.cpp"
+				RelativePath="..\src\modules\m_maphide.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1807,7 +2443,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_ident.cpp"
+				RelativePath="..\src\modules\m_md5.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1827,7 +2463,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_invisible.cpp"
+				RelativePath="..\src\modules\m_messageflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1847,7 +2483,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_inviteexception.cpp"
+				RelativePath="..\src\modules\m_muteban.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1867,7 +2503,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_joinflood.cpp"
+				RelativePath="..\src\modules\m_namesx.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1887,7 +2523,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_jumpserver.cpp"
+				RelativePath="..\src\modules\m_nickflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1907,7 +2543,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_kicknorejoin.cpp"
+				RelativePath="..\src\modules\m_nicklock.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1927,7 +2563,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_knock.cpp"
+				RelativePath="..\src\modules\m_noctcp.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1947,7 +2583,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_lockserv.cpp"
+				RelativePath="..\src\modules\m_noinvite.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1967,7 +2603,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_md5.cpp"
+				RelativePath="..\src\modules\m_nokicks.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -1987,7 +2623,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_messageflood.cpp"
+				RelativePath="..\src\modules\m_nonicks.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2007,7 +2643,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_namesx.cpp"
+				RelativePath="..\src\modules\m_nonotice.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2027,7 +2663,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nickflood.cpp"
+				RelativePath="..\src\modules\m_nopartmsg.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2047,7 +2683,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nicklock.cpp"
+				RelativePath="..\src\modules\m_oper_hash.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2067,7 +2703,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_noctcp.cpp"
+				RelativePath="..\src\modules\m_operchans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2087,7 +2723,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_noinvite.cpp"
+				RelativePath="..\src\modules\m_operflood.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2107,7 +2743,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nokicks.cpp"
+				RelativePath="..\src\modules\m_operjoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2127,7 +2763,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nonicks.cpp"
+				RelativePath="..\src\modules\m_operlevels.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2147,7 +2783,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_nonotice.cpp"
+				RelativePath="..\src\modules\m_operlog.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2167,7 +2803,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_oper_hash.cpp"
+				RelativePath="..\src\modules\m_opermodes.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2187,7 +2823,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operchans.cpp"
+				RelativePath="..\src\modules\m_opermotd.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2207,7 +2843,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operflood.cpp"
+				RelativePath="..\src\modules\m_override.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2227,7 +2863,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operjoin.cpp"
+				RelativePath="..\src\modules\m_password_hash.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2247,7 +2883,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operlevels.cpp"
+				RelativePath="..\src\modules\m_permchannels.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2267,7 +2903,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_operlog.cpp"
+				RelativePath="..\src\modules\m_proxyscan.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2287,7 +2923,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_opermodes.cpp"
+				RelativePath="..\src\modules\m_randquote.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2307,7 +2943,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_opermotd.cpp"
+				RelativePath="..\src\modules\m_redirect.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2327,7 +2963,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_override.cpp"
+				RelativePath="..\src\modules\m_regonlycreate.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2347,7 +2983,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_randquote.cpp"
+				RelativePath="..\src\modules\m_remoteinclude_http.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2367,7 +3003,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_redirect.cpp"
+				RelativePath="..\src\modules\m_remove.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2387,7 +3023,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_regonlycreate.cpp"
+				RelativePath="..\src\modules\m_restrictbanned.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2407,7 +3043,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_remoteinclude_http.cpp"
+				RelativePath="..\src\modules\m_restrictchans.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2427,7 +3063,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_remove.cpp"
+				RelativePath="..\src\modules\m_restrictmsg.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2447,7 +3083,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_restrictbanned.cpp"
+				RelativePath="..\src\modules\m_ripemd160.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2467,7 +3103,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_restrictchans.cpp"
+				RelativePath="..\src\modules\m_rpc_json.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2487,7 +3123,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_restrictmsg.cpp"
+				RelativePath="..\src\modules\m_rpctest.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2507,7 +3143,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_rpc_json.cpp"
+				RelativePath="..\src\modules\m_safelist.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2527,7 +3163,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_rpctest.cpp"
+				RelativePath="..\src\modules\m_sajoin.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2547,7 +3183,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_safelist.cpp"
+				RelativePath="..\src\modules\m_samode.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2567,7 +3203,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_sajoin.cpp"
+				RelativePath="..\src\modules\m_sanick.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2587,7 +3223,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_samode.cpp"
+				RelativePath="..\src\modules\m_sapart.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2607,7 +3243,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_sanick.cpp"
+				RelativePath="..\src\modules\m_saquit.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2627,7 +3263,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_sapart.cpp"
+				RelativePath="..\src\modules\m_sasl.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2647,7 +3283,7 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\src\modules\m_saquit.cpp"
+				RelativePath="..\src\modules\m_satopic.cpp"
 				>
 				<FileConfiguration
 					Name="Debug|Win32"
@@ -2706,6 +3342,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_serverban.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_services.cpp"
 				>
@@ -2886,6 +3542,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_shun.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_silence.cpp"
 				>
@@ -3206,6 +3882,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_xline_db.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_xmlsocket.cpp"
 				>
@@ -4763,7 +5459,7 @@
 				>
 			</File>
 			<File
-				RelativePath=".\inspircd.rc"
+				RelativePath=".\resource.rc"
 				>
 			</File>
 		</Filter>
diff --git a/win/m_spanningtreeVC90.vcproj b/win/m_spanningtreeVC90.vcproj
index 5cc078701..aa2e91444 100644
--- a/win/m_spanningtreeVC90.vcproj
+++ b/win/m_spanningtreeVC90.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="m_spanningtree"
 	ProjectGUID="{1EC86B60-AB2A-4984-8A7E-0422C15601E0}"
 	RootNamespace="m_spanningtree"
@@ -131,7 +131,7 @@
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;DLL_BUILD;WIN64"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -217,6 +217,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
 				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -229,12 +230,11 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions="/MD"
 				AdditionalDependencies="ws2_32.lib inspircd.lib cmd_whois.lib cmd_stats.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib"
 				OutputFile="$(OutDir)/m_spanningtree.so"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\bin\release\bin;..\bin\release\lib"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -298,7 +298,7 @@
 				AdditionalIncludeDirectories="..\include;..\win;..\src\modules\m_spanningtree;.;..\src\modules"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;M_SPANNINGTREE_EXPORTS;DLL_BUILD"
 				MinimalRebuild="true"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
 				WarningLevel="2"
 				Detect64BitPortabilityProblems="true"
@@ -367,6 +367,10 @@
 				RelativePath="..\src\modules\m_spanningtree\admin.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\modules\m_spanningtree\cachetimer.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_spanningtree\capab.cpp"
 				>
@@ -407,10 +411,6 @@
 				RelativePath="..\src\modules\m_spanningtree\hmac.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\inspircd_memory_functions.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\modules\m_spanningtree\kill.cpp"
 				>
@@ -563,10 +563,6 @@
 				RelativePath="..\src\modules\m_spanningtree\time.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\modules\m_spanningtree\timesynctimer.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\src\modules\m_spanningtree\treeserver.cpp"
 				>
@@ -601,6 +597,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\src\modules\m_spanningtree\cachetimer.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\modules\m_spanningtree\handshaketimer.h"
 				>
@@ -625,10 +625,6 @@
 				RelativePath="..\src\modules\m_spanningtree\rsquit.h"
 				>
 			</File>
-			<File
-				RelativePath="..\src\modules\m_spanningtree\timesynctimer.h"
-				>
-			</File>
 			<File
 				RelativePath="..\src\modules\m_spanningtree\treeserver.h"
 				>
@@ -647,6 +643,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath=".\inspircd_memory_functions.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>
-- 
cgit v1.3.1-10-gc9f91