From: Danny Mayer <mayer@ntp.org>
Date: Mon, 24 Aug 2009 19:14:02 +0000 (-0400)
Subject: [Bug 1289] Fix compiler files for Windows
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd4c603f7cfd7382fed2c94ebf3857be45b1079f;p=thirdparty%2Fntp.git

[Bug 1289] Fix compiler files for Windows

bk: 4a92e67aw7q0GA-EJUlDWZJuCAlQcA
---

diff --git a/ports/winnt/libntp/libntp.dsp b/ports/winnt/libntp/libntp.dsp
index b359e1f666..4bab8254e1 100644
--- a/ports/winnt/libntp/libntp.dsp
+++ b/ports/winnt/libntp/libntp.dsp
@@ -406,6 +406,10 @@ SOURCE=..\..\..\libntp\uinttoa.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\util_clockstuff.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\libisc\win32os.c
 # End Source File
 # Begin Source File
diff --git a/ports/winnt/libntp/libntp.vcproj b/ports/winnt/libntp/libntp.vcproj
index 2879482d3c..0cb07cf743 100644
--- a/ports/winnt/libntp/libntp.vcproj
+++ b/ports/winnt/libntp/libntp.vcproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="libntp"
-	ProjectGUID="{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}"
-	TargetFrameworkVersion="0"
+	ProjectGUID="{137B1CA5-DA8C-491C-8FA1-0CBD5003500A}"
 	>
 	<Platforms>
 		<Platform
@@ -23,7 +22,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -43,12 +41,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,..\..\..\libopts"
-				PreprocessorDefinitions="_DEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="_DEBUG;_LIB;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/libntp.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
@@ -56,8 +53,7 @@
 				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -102,7 +98,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -123,23 +118,17 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,..\..\..\libopts"
-				PreprocessorDefinitions="NDEBUG;_LIB;WIN32;SYS_WINNT;HAVE_CONFIG_H"
-				GeneratePreprocessedFile="0"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="NDEBUG;_LIB;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="false"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/libntp.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release\"
-				BrowseInformation="1"
+				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -535,6 +524,28 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="dnslookup.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\..\libntp\dofptoa.c"
 				>
@@ -690,8 +701,26 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\getclock.c"
+				RelativePath="getclock.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\libntp\getopt.c"
@@ -762,6 +791,24 @@
 			<File
 				RelativePath="..\..\..\libntp\humandate.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\libisc\inet_aton.c"
@@ -971,7 +1018,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="0"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -981,7 +1027,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="0"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1010,6 +1055,24 @@
 			<File
 				RelativePath="..\..\..\libisc\md5.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\libntp\memmove.c"
@@ -1300,6 +1363,24 @@
 			<File
 				RelativePath="..\..\..\libntp\ntp_lineedit.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\libntp\ntp_random.c"
@@ -1522,8 +1603,26 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\setpriority.c"
+				RelativePath="setpriority.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="SetSystemTime.c"
@@ -1834,8 +1933,26 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\util_clockstuff.c"
+				RelativePath="util_clockstuff.c"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\libisc\win32os.c"
@@ -1886,10 +2003,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="..\..\..\libopts\ag-char-map.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\binio.h"
 				>
@@ -1922,6 +2035,10 @@
 				RelativePath="..\..\..\include\isc\interfaceiter.h"
 				>
 			</File>
+			<File
+				RelativePath="..\include\inttypes.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\sys\ioctl.h"
 				>
@@ -1966,10 +2083,6 @@
 				RelativePath="..\..\..\include\ntp.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_assert.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\ntp_calendar.h"
 				>
@@ -1978,10 +2091,6 @@
 				RelativePath="..\..\..\include\ntp_control.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_debug.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\ntp_fp.h"
 				>
@@ -2014,10 +2123,6 @@
 				RelativePath="..\..\..\include\ntp_malloc.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_net.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\ntp_proto.h"
 				>
@@ -2070,10 +2175,6 @@
 				RelativePath="..\..\..\include\recvbuff.h"
 				>
 			</File>
-			<File
-				RelativePath="..\include\sys\resource.h"
-				>
-			</File>
 			<File
 				RelativePath="..\include\sys\signal.h"
 				>
diff --git a/ports/winnt/ntp-keygen/ntpkeygen.dsp b/ports/winnt/ntp-keygen/ntpkeygen.dsp
index 3c87efb585..0614122a5f 100644
--- a/ports/winnt/ntp-keygen/ntpkeygen.dsp
+++ b/ports/winnt/ntp-keygen/ntpkeygen.dsp
@@ -108,10 +108,6 @@ SOURCE=..\libntp\randfile.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libntp\util_clockstuff.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\version.c
 # End Source File
 # End Group
diff --git a/ports/winnt/ntp.sln b/ports/winnt/ntp.sln
index 36166cf71f..94108c06ff 100644
--- a/ports/winnt/ntp.sln
+++ b/ports/winnt/ntp.sln
@@ -1,33 +1,30 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpd", "ntpd\ntpd.vcproj", "{CB61F8BF-9637-495C-9087-E8664B400CE0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
-	EndProjectSection
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsrv", "instsrv\Instsrv.vcproj", "{88A3EE95-FECE-4E33-9F72-C9335A97B731}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "instsrv", "instsrv\instsrv.vcproj", "{C3534C4D-6DF1-498E-9904-4337878A1515}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libntp", "libntp\libntp.vcproj", "{137B1CA5-DA8C-491C-8FA1-0CBD5003500A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libntp", "libntp\libntp.vcproj", "{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdate", "ntpdate\ntpdate.vcproj", "{2789A62E-3F46-44F1-AAF0-816CD23C2911}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpd", "ntpd\ntpd.vcproj", "{B01F5169-943C-4945-A017-D2427AC30191}"
 	ProjectSection(ProjectDependencies) = postProject
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A} = {137B1CA5-DA8C-491C-8FA1-0CBD5003500A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdc", "ntpdc\ntpdc.vcproj", "{8011C820-B3D5-4034-86EA-FFC30AE6764B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdate", "ntpdate\ntpdate.vcproj", "{11DDB7BB-6C6B-4F52-87F5-47738AA49A18}"
 	ProjectSection(ProjectDependencies) = postProject
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A} = {137B1CA5-DA8C-491C-8FA1-0CBD5003500A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntp-keygen", "ntp-keygen\ntp-keygen.vcproj", "{C88C1FBF-59D2-447F-BF57-0BCA8889028F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpdc", "ntpdc\ntpdc.vcproj", "{7A36A561-055C-420D-A4D0-1D90D24B8ECF}"
 	ProjectSection(ProjectDependencies) = postProject
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A} = {137B1CA5-DA8C-491C-8FA1-0CBD5003500A}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpq", "ntpq\ntpq.vcproj", "{6A92BF14-8931-48B1-A571-DEBE9F190616}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpkeygen", "ntp-keygen\ntpkeygen.vcproj", "{6AE50404-FB6C-4658-86A5-4717CEFC79C1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ntpq", "ntpq\ntpq.vcproj", "{BA3BA083-A4A5-4378-89E8-48EAD998F261}"
 	ProjectSection(ProjectDependencies) = postProject
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00} = {400FBFCB-462E-40D0-B06B-3B74E3FFFD00}
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A} = {137B1CA5-DA8C-491C-8FA1-0CBD5003500A}
 	EndProjectSection
 EndProject
 Global
@@ -36,34 +33,34 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C3534C4D-6DF1-498E-9904-4337878A1515}.Debug|Win32.Build.0 = Debug|Win32
-		{C3534C4D-6DF1-498E-9904-4337878A1515}.Release|Win32.ActiveCfg = Release|Win32
-		{C3534C4D-6DF1-498E-9904-4337878A1515}.Release|Win32.Build.0 = Release|Win32
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|Win32.ActiveCfg = Debug|Win32
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Debug|Win32.Build.0 = Debug|Win32
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|Win32.ActiveCfg = Release|Win32
-		{400FBFCB-462E-40D0-B06B-3B74E3FFFD00}.Release|Win32.Build.0 = Release|Win32
-		{CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{CB61F8BF-9637-495C-9087-E8664B400CE0}.Debug|Win32.Build.0 = Debug|Win32
-		{CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|Win32.ActiveCfg = Release|Win32
-		{CB61F8BF-9637-495C-9087-E8664B400CE0}.Release|Win32.Build.0 = Release|Win32
-		{2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2789A62E-3F46-44F1-AAF0-816CD23C2911}.Debug|Win32.Build.0 = Debug|Win32
-		{2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|Win32.ActiveCfg = Release|Win32
-		{2789A62E-3F46-44F1-AAF0-816CD23C2911}.Release|Win32.Build.0 = Release|Win32
-		{8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8011C820-B3D5-4034-86EA-FFC30AE6764B}.Debug|Win32.Build.0 = Debug|Win32
-		{8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|Win32.ActiveCfg = Release|Win32
-		{8011C820-B3D5-4034-86EA-FFC30AE6764B}.Release|Win32.Build.0 = Release|Win32
-		{C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Debug|Win32.Build.0 = Debug|Win32
-		{C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|Win32.ActiveCfg = Release|Win32
-		{C88C1FBF-59D2-447F-BF57-0BCA8889028F}.Release|Win32.Build.0 = Release|Win32
-		{6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6A92BF14-8931-48B1-A571-DEBE9F190616}.Debug|Win32.Build.0 = Debug|Win32
-		{6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|Win32.ActiveCfg = Release|Win32
-		{6A92BF14-8931-48B1-A571-DEBE9F190616}.Release|Win32.Build.0 = Release|Win32
+		{88A3EE95-FECE-4E33-9F72-C9335A97B731}.Debug|Win32.ActiveCfg = Debug|Win32
+		{88A3EE95-FECE-4E33-9F72-C9335A97B731}.Debug|Win32.Build.0 = Debug|Win32
+		{88A3EE95-FECE-4E33-9F72-C9335A97B731}.Release|Win32.ActiveCfg = Release|Win32
+		{88A3EE95-FECE-4E33-9F72-C9335A97B731}.Release|Win32.Build.0 = Release|Win32
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A}.Debug|Win32.Build.0 = Debug|Win32
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A}.Release|Win32.ActiveCfg = Release|Win32
+		{137B1CA5-DA8C-491C-8FA1-0CBD5003500A}.Release|Win32.Build.0 = Release|Win32
+		{B01F5169-943C-4945-A017-D2427AC30191}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B01F5169-943C-4945-A017-D2427AC30191}.Debug|Win32.Build.0 = Debug|Win32
+		{B01F5169-943C-4945-A017-D2427AC30191}.Release|Win32.ActiveCfg = Release|Win32
+		{B01F5169-943C-4945-A017-D2427AC30191}.Release|Win32.Build.0 = Release|Win32
+		{11DDB7BB-6C6B-4F52-87F5-47738AA49A18}.Debug|Win32.ActiveCfg = Debug|Win32
+		{11DDB7BB-6C6B-4F52-87F5-47738AA49A18}.Debug|Win32.Build.0 = Debug|Win32
+		{11DDB7BB-6C6B-4F52-87F5-47738AA49A18}.Release|Win32.ActiveCfg = Release|Win32
+		{11DDB7BB-6C6B-4F52-87F5-47738AA49A18}.Release|Win32.Build.0 = Release|Win32
+		{7A36A561-055C-420D-A4D0-1D90D24B8ECF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7A36A561-055C-420D-A4D0-1D90D24B8ECF}.Debug|Win32.Build.0 = Debug|Win32
+		{7A36A561-055C-420D-A4D0-1D90D24B8ECF}.Release|Win32.ActiveCfg = Release|Win32
+		{7A36A561-055C-420D-A4D0-1D90D24B8ECF}.Release|Win32.Build.0 = Release|Win32
+		{6AE50404-FB6C-4658-86A5-4717CEFC79C1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6AE50404-FB6C-4658-86A5-4717CEFC79C1}.Debug|Win32.Build.0 = Debug|Win32
+		{6AE50404-FB6C-4658-86A5-4717CEFC79C1}.Release|Win32.ActiveCfg = Release|Win32
+		{6AE50404-FB6C-4658-86A5-4717CEFC79C1}.Release|Win32.Build.0 = Release|Win32
+		{BA3BA083-A4A5-4378-89E8-48EAD998F261}.Debug|Win32.ActiveCfg = Debug|Win32
+		{BA3BA083-A4A5-4378-89E8-48EAD998F261}.Debug|Win32.Build.0 = Debug|Win32
+		{BA3BA083-A4A5-4378-89E8-48EAD998F261}.Release|Win32.ActiveCfg = Release|Win32
+		{BA3BA083-A4A5-4378-89E8-48EAD998F261}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ports/winnt/ntpd/ntpd.dsp b/ports/winnt/ntpd/ntpd.dsp
index 3003f6d719..a6c229f90e 100644
--- a/ports/winnt/ntpd/ntpd.dsp
+++ b/ports/winnt/ntpd/ntpd.dsp
@@ -507,7 +507,6 @@ SOURCE=..\..\..\ntpd\refclock_arbiter.c
 # Begin Source File
 
 SOURCE=..\..\..\ntpd\refclock_arc.c
-# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
@@ -517,7 +516,6 @@ SOURCE=..\..\..\ntpd\refclock_as2201.c
 # Begin Source File
 
 SOURCE=..\..\..\ntpd\refclock_atom.c
-# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
@@ -604,7 +602,6 @@ SOURCE=..\..\..\ntpd\refclock_nmea.c
 # Begin Source File
 
 SOURCE=..\..\..\ntpd\refclock_oncore.c
-# PROP Exclude_From_Build 1
 # End Source File
 # Begin Source File
 
@@ -657,7 +654,6 @@ SOURCE=..\..\..\ntpd\refclock_usno.c
 # Begin Source File
 
 SOURCE=..\..\..\ntpd\refclock_wwvb.c
-# PROP Exclude_From_Build 1
 # End Source File
 # End Group
 # Begin Group "Parse Lib"
diff --git a/ports/winnt/ntpd/ntpd.vcproj b/ports/winnt/ntpd/ntpd.vcproj
index 45df9571c6..f88258c7b3 100644
--- a/ports/winnt/ntpd/ntpd.vcproj
+++ b/ports/winnt/ntpd/ntpd.vcproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="ntpd"
-	ProjectGUID="{CB61F8BF-9637-495C-9087-E8664B400CE0}"
-	TargetFrameworkVersion="0"
+	ProjectGUID="{B01F5169-943C-4945-A017-D2427AC30191}"
 	>
 	<Platforms>
 		<Platform
@@ -23,8 +22,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -46,25 +43,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,$(OPENSSL)\include,..\..\..\libopts"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="false"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/ntpd.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
-				ProgramDataBaseFileName="..\bin\Release\ntpd-vc90"
+				ProgramDataBaseFileName=".\Release/"
 				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -79,19 +70,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL)\lib\libeay32.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib winmm.lib $(OPENSSL)\out32dll\libeay32.lib"
 				OutputFile="../bin/Release/ntpd.exe"
-				Version="0x0400"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Release\ntpd.pdb"
+				ProgramDatabaseFile=".\Release/ntpd.pdb"
 				SubSystem="1"
-				OptimizeForWindows98="0"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="2"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -114,6 +98,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -127,8 +114,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -150,27 +135,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\libopts"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
-				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/ntpd.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName="..\bin\Debug\ntpd-vc90"
+				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
-				WarningLevel="4"
+				WarningLevel="3"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -185,19 +162,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib winmm.lib $(OPENSSL)\lib\libeay32.lib"
+				AdditionalDependencies="odbc32.lib odbccp32.lib ws2_32.lib winmm.lib $(OPENSSL)\out32dll\libeay32.lib"
 				OutputFile="../bin/Debug/ntpd.exe"
-				Version="0x0400"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Debug\ntpd.pdb"
+				ProgramDatabaseFile=".\Debug/ntpd.pdb"
 				SubSystem="1"
-				OptimizeForWindows98="0"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -220,6 +191,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -235,6 +209,24 @@
 			<File
 				RelativePath="..\..\..\ntpd\cmd_args.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="nt_clockstuff.c"
@@ -327,6 +319,24 @@
 			<File
 				RelativePath="..\..\..\ntpd\ntp_data_structures.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\ntpd\ntp_filegen.c"
@@ -463,6 +473,24 @@
 			<File
 				RelativePath="..\..\..\ntpd\ntp_parser.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\ntpd\ntp_peer.c"
@@ -483,7 +511,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						GeneratePreprocessedFile="0"
 					/>
 				</FileConfiguration>
 			</File>
@@ -578,10 +605,24 @@
 			<File
 				RelativePath="..\..\..\ntpd\ntp_scanner.c"
 				>
-			</File>
-			<File
-				RelativePath="..\..\..\ntpd\ntp_signd.c"
-				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\ntpd\ntp_timer.c"
@@ -808,10 +849,6 @@
 				RelativePath="..\..\..\include\ntp.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_assert.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\ntp_calendar.h"
 				>
@@ -852,10 +889,6 @@
 				RelativePath="..\include\ntp_iocompletionport.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_lists.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\ntp_machine.h"
 				>
@@ -864,14 +897,6 @@
 				RelativePath="..\..\..\include\ntp_malloc.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_net.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ntpd\ntp_parser.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\ntp_proto.h"
 				>
@@ -892,10 +917,6 @@
 				RelativePath="..\..\..\include\ntp_rfc2553.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\ntpd\ntp_scanner.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\include\ntp_select.h"
 				>
@@ -936,10 +957,6 @@
 				RelativePath="..\..\..\include\ntpd.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\include\ntpsim.h"
-				>
-			</File>
 			<File
 				RelativePath="..\include\ntservice.h"
 				>
@@ -980,10 +997,6 @@
 				RelativePath="..\include\termios.h"
 				>
 			</File>
-			<File
-				RelativePath="..\include\timepps.h"
-				>
-			</File>
 			<File
 				RelativePath="..\include\transmitbuff.h"
 				>
@@ -1013,7 +1026,7 @@
 					<Tool
 						Name="VCResourceCompilerTool"
 						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="..\libntp"
+						AdditionalIncludeDirectories="\ntp-dev-4.2.5p205\ports\winnt\libntp"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1022,7 +1035,7 @@
 					<Tool
 						Name="VCResourceCompilerTool"
 						PreprocessorDefinitions=""
-						AdditionalIncludeDirectories="..\libntp"
+						AdditionalIncludeDirectories="\ntp-dev-4.2.5p205\ports\winnt\libntp"
 					/>
 				</FileConfiguration>
 			</File>
@@ -1040,7 +1053,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						ShowIncludes="true"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -1231,6 +1243,24 @@
 			<File
 				RelativePath="..\..\..\ntpd\refclock_chronolog.c"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\..\ntpd\refclock_chu.c"
@@ -1464,10 +1494,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\..\ntpd\refclock_jjy.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\ntpd\refclock_jupiter.c"
 				>
@@ -1678,18 +1704,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\..\ntpd\refclock_pcf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\..\ntpd\refclock_pst.c"
 				>
@@ -2100,18 +2114,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\..\libparse\clk_varitext.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\..\..\libparse\data_mbg.c"
 				>
@@ -2194,7 +2196,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\scripts\mkver.bat -P ntpd&#x0D;&#x0A;"
-					AdditionalDependencies="..\scripts\mkver.bat;..\include\config.h;ntp_iocompletionport.c;win32_io.c;ntpd.c;ntp_timer.c;"
+					AdditionalDependencies="..\scripts\mkver.bat;"
 					Outputs="$(ProjectDir)version.c"
 				/>
 			</FileConfiguration>
@@ -2204,7 +2206,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					CommandLine="echo Using NT Shell Script to generate version.c&#x0D;&#x0A;..\scripts\mkver.bat -P ntpd&#x0D;&#x0A;"
-					AdditionalDependencies="..\scripts\mkver.bat;..\include\config.h;ntp_iocompletionport.c;win32_io.c;ntpd.c;ntp_timer.c;"
+					AdditionalDependencies="..\scripts\mkver.bat;"
 					Outputs="$(ProjectDir)version.c"
 				/>
 			</FileConfiguration>
diff --git a/ports/winnt/ntpdate/ntpdate.dsp b/ports/winnt/ntpdate/ntpdate.dsp
index 9bac7d625c..14cc5777c4 100644
--- a/ports/winnt/ntpdate/ntpdate.dsp
+++ b/ports/winnt/ntpdate/ntpdate.dsp
@@ -92,10 +92,6 @@ SOURCE=..\..\..\ntpdate\ntpdate.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libntp\util_clockstuff.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\version.c
 # End Source File
 # End Group
diff --git a/ports/winnt/ntpdate/ntpdate.vcproj b/ports/winnt/ntpdate/ntpdate.vcproj
index 9a0da28e86..ec2af228d5 100644
--- a/ports/winnt/ntpdate/ntpdate.vcproj
+++ b/ports/winnt/ntpdate/ntpdate.vcproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="ntpdate"
-	ProjectGUID="{2789A62E-3F46-44F1-AAF0-816CD23C2911}"
-	TargetFrameworkVersion="0"
+	ProjectGUID="{11DDB7BB-6C6B-4F52-87F5-47738AA49A18}"
 	>
 	<Platforms>
 		<Platform
@@ -23,7 +22,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="version.c,*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -45,21 +43,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/ntpdate.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName="..\bin\Debug\ntpdate-vc90"
+				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -76,16 +72,11 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
 				OutputFile="../bin/Debug/ntpdate.exe"
-				Version="0x0400"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Debug\ntpdate.pdb"
+				ProgramDatabaseFile=".\Debug/ntpdate.pdb"
 				SubSystem="1"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -108,6 +99,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -121,7 +115,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="version.c,*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -144,20 +137,17 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/ntpdate.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
-				ProgramDataBaseFileName="..\bin\Release\ntpdate-vc90"
+				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -174,16 +164,10 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
 				OutputFile="../bin/Release/ntpdate.exe"
-				Version="0x0400"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Release\ntpdate.pdb"
+				ProgramDatabaseFile=".\Release/ntpdate.pdb"
 				SubSystem="1"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -206,6 +190,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -267,62 +254,10 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="..\include\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\include\isc\net.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_fp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_io.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_machine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_net.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_select.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_stdlib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_string.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_syslog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_unixtime.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\ntpdate\ntpdate.h"
 				>
 			</File>
-			<File
-				RelativePath="..\include\syslog.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/ports/winnt/ntpdc/ntpdc.dsp b/ports/winnt/ntpdc/ntpdc.dsp
index 5d908aa159..9a0af685b6 100644
--- a/ports/winnt/ntpdc/ntpdc.dsp
+++ b/ports/winnt/ntpdc/ntpdc.dsp
@@ -99,10 +99,6 @@ SOURCE=..\..\..\ntpdc\ntpdc_ops.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libntp\util_clockstuff.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\version.c
 # End Source File
 # End Group
diff --git a/ports/winnt/ntpdc/ntpdc.vcproj b/ports/winnt/ntpdc/ntpdc.vcproj
index d3f6a3908d..6645952805 100644
--- a/ports/winnt/ntpdc/ntpdc.vcproj
+++ b/ports/winnt/ntpdc/ntpdc.vcproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="ntpdc"
-	ProjectGUID="{8011C820-B3D5-4034-86EA-FFC30AE6764B}"
-	TargetFrameworkVersion="0"
+	ProjectGUID="{7A36A561-055C-420D-A4D0-1D90D24B8ECF}"
 	>
 	<Platforms>
 		<Platform
@@ -23,7 +22,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="version.c,*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -45,21 +43,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\libopts"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/ntpdc.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName="..\bin\Debug\ntpdc-vc90"
+				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -76,16 +72,11 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
 				OutputFile="../bin/Debug/ntpdc.exe"
-				Version="0x0400"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Debug\ntpdc.pdb"
+				ProgramDatabaseFile=".\Debug/ntpdc.pdb"
 				SubSystem="1"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -108,6 +99,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -121,7 +115,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="version.c,*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -144,19 +137,17 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\libopts"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/ntpdc.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
-				ProgramDataBaseFileName="..\bin\Release\ntpdc-vc90"
+				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -173,16 +164,10 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
 				OutputFile="../bin/Release/ntpdc.exe"
-				Version="0x0400"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Release\ntpdc.pdb"
+				ProgramDatabaseFile=".\Release/ntpdc.pdb"
 				SubSystem="1"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -205,6 +190,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -227,7 +215,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -237,7 +224,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="3"
 					/>
 				</FileConfiguration>
 			</File>
@@ -251,7 +237,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -261,7 +246,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="3"
 					/>
 				</FileConfiguration>
 			</File>
@@ -275,7 +259,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="3"
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -285,7 +268,6 @@
 						Name="VCCLCompilerTool"
 						AdditionalIncludeDirectories=""
 						PreprocessorDefinitions=""
-						WarningLevel="3"
 					/>
 				</FileConfiguration>
 			</File>
@@ -316,14 +298,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="..\..\..\include\ntp_assert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\include\ntp_lineedit.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\ntpdc\ntpdc.h"
 				>
diff --git a/ports/winnt/ntpq/ntpq.dsp b/ports/winnt/ntpq/ntpq.dsp
index e3ad702011..fec94acef0 100644
--- a/ports/winnt/ntpq/ntpq.dsp
+++ b/ports/winnt/ntpq/ntpq.dsp
@@ -99,10 +99,6 @@ SOURCE=..\..\..\ntpq\ntpq.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libntp\util_clockstuff.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\version.c
 # End Source File
 # End Group
diff --git a/ports/winnt/ntpq/ntpq.vcproj b/ports/winnt/ntpq/ntpq.vcproj
index d044d65e92..78b9b2044c 100644
--- a/ports/winnt/ntpq/ntpq.vcproj
+++ b/ports/winnt/ntpq/ntpq.vcproj
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="8.00"
 	Name="ntpq"
-	ProjectGUID="{6A92BF14-8931-48B1-A571-DEBE9F190616}"
-	TargetFrameworkVersion="0"
+	ProjectGUID="{BA3BA083-A4A5-4378-89E8-48EAD998F261}"
 	>
 	<Platforms>
 		<Platform
@@ -23,7 +22,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="version.c,*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -46,19 +44,17 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\libopts"
-				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				PrecompiledHeaderFile=".\Release/ntpq.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
-				ProgramDataBaseFileName="..\bin\Release\ntpq-vc90"
+				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -75,16 +71,10 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
 				OutputFile="../bin/Release/ntpq.exe"
-				Version="0x0400"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Release\ntpq.pdb"
+				ProgramDatabaseFile=".\Release/ntpq.pdb"
 				SubSystem="1"
-				LinkTimeCodeGeneration="0"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -107,6 +97,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -120,7 +113,6 @@
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="2"
-			DeleteExtensionsOnClean="version.c,*.obj;*.ilk;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -142,21 +134,19 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".,..\include,..\..\..\include,,$(OPENSSL)\include,$(OPENSSL)\inc32,..\..\..\libopts"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;;SYS_WINNT;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
+				AdditionalIncludeDirectories=".,..\include,..\..\..\include,$(OPENSSL)\inc32,..\..\..\libopts"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32;__STDC__;SYS_WINNT;HAVE_CONFIG_H;_WIN32_WINNT=0x400;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				PrecompiledHeaderFile=".\Debug/ntpq.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName="..\bin\Debug\ntpq-vc90"
+				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="4"
 				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -173,16 +163,11 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib"
 				OutputFile="../bin/Debug/ntpq.exe"
-				Version="0x0400"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				GenerateManifest="false"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="..\bin\Debug\ntpq.pdb"
+				ProgramDatabaseFile=".\Debug/ntpq.pdb"
 				SubSystem="1"
-				LinkTimeCodeGeneration="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -205,6 +190,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
@@ -310,10 +298,6 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
-			<File
-				RelativePath="..\..\..\include\ntp_lineedit.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\ntpq\ntpq.h"
 				>