From: Juergen Perlinger <perlinger@ntp.org>
Date: Sun, 19 Apr 2015 10:38:34 +0000 (+0200)
Subject: Fixed include file lists; improved generation of 'ntp_keyword.h'
X-Git-Tag: NTP_4_3_27~1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34aa3d0757756498fec9bc447d544a9ef12f7228;p=thirdparty%2Fntp.git

Fixed include file lists; improved generation of 'ntp_keyword.h'

bk: 553385aaZ0SPCNYBLjR6zYGzLZlIgA
---

diff --git a/ports/winnt/vs2008/libntp/libntp.vcproj b/ports/winnt/vs2008/libntp/libntp.vcproj
index ad27104d4..191cdfcf7 100644
--- a/ports/winnt/vs2008/libntp/libntp.vcproj
+++ b/ports/winnt/vs2008/libntp/libntp.vcproj
@@ -720,10 +720,6 @@
 				RelativePath="..\..\include\gaa_compat.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\include\global.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\lib\isc\include\isc\hash.h"
 				>
@@ -732,10 +728,6 @@
 				RelativePath="..\..\..\..\include\ieee754io.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\netinet\in.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\include\arpa\inet.h"
 				>
@@ -773,7 +765,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\include\md5.h"
+				RelativePath="..\..\..\..\lib\isc\include\isc\md5.h"
 				>
 			</File>
 			<File
@@ -789,7 +781,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\include\isc\netaddr.h"
+				RelativePath="..\..\..\..\lib\isc\include\isc\netaddr.h"
 				>
 			</File>
 			<File
@@ -797,7 +789,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\include\isc\netscope.h"
+				RelativePath="..\..\..\..\lib\isc\include\isc\netscope.h"
 				>
 			</File>
 			<File
@@ -937,7 +929,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\sys\socket.h"
+				RelativePath="..\..\..\..\lib\isc\include\isc\socket.h"
 				>
 			</File>
 			<File
@@ -965,7 +957,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h"
+				RelativePath="..\..\include\sys\time.h"
 				>
 			</File>
 			<File
@@ -973,7 +965,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\sys\time.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\time.h"
 				>
 			</File>
 			<File
@@ -997,7 +989,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\isc\win32os.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\win32os.h"
 				>
 			</File>
 		</Filter>
diff --git a/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat b/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat
index 4d4f92884..908b02b4d 100644
--- a/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat
+++ b/ports/winnt/vs2008/ntpd/gen-ntp_keyword.bat
@@ -1,28 +1,40 @@
-@echo off
+<@echo off
 REM gen-ntp_keyword.bat
 REM helper to invoke keyword-gen and possibly update ntp_keyword.h
 REM Usage:
 REM   gen-ntp_keyword dir_containing_keyword-gen.exe
 REM
-if "x%1"=="x" goto Usage
+
+set HDR_FILE=..\..\..\..\ntpd\ntp_keyword.h
+set UTD_FILE=..\..\..\..\ntpd\keyword-gen-utd
+
+if "{%1}" == "{}" goto Usage
 if not exist "%1\keyword-gen.exe" goto ExeNotFound
 "%1\keyword-gen.exe" ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h
+
+REM check if we must create both files from scratch
+if not exist "%HDR_FILE%" goto createFiles
+if not exist "%UTD_FILE%" goto createFiles
+
 findstr /v diff_ignore_line new_keyword.h > new_keyword_cmp.h
-findstr /v diff_ignore_line ..\..\..\..\ntpd\ntp_keyword.h > ntp_keyword_cmp.h
+findstr /v diff_ignore_line "%HDR_FILE%"  > ntp_keyword_cmp.h
 set meat_changed=0
 fc /L ntp_keyword_cmp.h new_keyword_cmp.h > NUL
 if errorlevel 1 set meat_changed=1
 del ntp_keyword_cmp.h new_keyword_cmp.h
 if "0"=="%meat_changed%" goto SkipUpdate
-copy /y /v new_keyword.h ..\..\..\..\ntpd\ntp_keyword.h
-findstr diff_ignore_line new_keyword.h > ..\..\..\..\ntpd\keyword-gen-utd
+
+:createFiles
+copy /y /v new_keyword.h "%HDR_FILE%"  > NUL
+findstr diff_ignore_line new_keyword.h > "%UTD_FILE%"
 echo updated keyword-gen-utd and ntp_keyword.h
 goto SkipSkipMsg
 
 :skipUpdate
 echo ntp_keyword.h is unchanged
-REM 'touch' the file by replacing it with a concatenation of itself and NUL:
-copy /b ..\..\..\..\ntpd\ntp_keyword.h+NUL: ..\..\..\..\ntpd\ntp_keyword.h
+REM 'touch' the files by replacing them with a concatenation of itself and NUL:
+copy /b "%HDR_FILE%" + NUL "%HDR_FILE%" > NUL
+copy /b "%UTD_FILE%" + NUL "%UTD_FILE%" > NUL
 
 :SkipSkipMsg
 set meat_changed=
diff --git a/ports/winnt/vs2008/ntpd/ntpd.vcproj b/ports/winnt/vs2008/ntpd/ntpd.vcproj
index c5689ce6f..8f2fa3bc8 100644
--- a/ports/winnt/vs2008/ntpd/ntpd.vcproj
+++ b/ports/winnt/vs2008/ntpd/ntpd.vcproj
@@ -453,15 +453,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\netinet\in.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\net.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\arpa\inet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\isc\int.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\int.h"
 				>
 			</File>
 			<File
@@ -485,17 +481,13 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\libntp\log.h"
+				RelativePath="..\..\..\..\lib\isc\include\isc\log.h"
 				>
 			</File>
 			<File
 				RelativePath="..\..\..\..\include\mbg_gps166.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\include\isc\net.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\lib\isc\include\isc\netaddr.h"
 				>
@@ -713,7 +705,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\isc\offset.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\offset.h"
 				>
 			</File>
 			<File
@@ -725,7 +717,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\isc\platform.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\platform.h"
 				>
 			</File>
 			<File
@@ -741,7 +733,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\sys\socket.h"
+				RelativePath="..\..\..\..\lib\isc\include\isc\socket.h"
 				>
 			</File>
 			<File
@@ -773,7 +765,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\isc\win32os.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\win32os.h"
 				>
 			</File>
 		</Filter>
@@ -794,7 +786,7 @@
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="..\libntp\messages.mc"
+				RelativePath="..\..\libntp\messages.mc"
 				>
 			</File>
 		</Filter>
diff --git a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
index 847c55a17..791d78d7e 100644
--- a/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
+++ b/ports/winnt/vs2008/ntpdate/ntpdate.vcproj
@@ -317,7 +317,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\include\isc\net.h"
+				RelativePath="..\..\..\..\lib\isc\win32\include\isc\net.h"
 				>
 			</File>
 			<File
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj b/ports/winnt/vs2013/libntp/libntp.vcxproj
index e7db9cd8a..fcf03b013 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj
@@ -318,16 +318,12 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\..\include\binio.h" />
     <ClInclude Include="..\..\..\..\include\declcond.h" />
-    <ClInclude Include="..\..\..\..\include\global.h" />
     <ClInclude Include="..\..\..\..\include\ieee754io.h" />
     <ClInclude Include="..\..\..\..\include\intreswork.h" />
     <ClInclude Include="..\..\..\..\include\iosignal.h" />
     <ClInclude Include="..\..\..\..\include\isc\mem.h" />
-    <ClInclude Include="..\..\..\..\include\isc\netaddr.h" />
-    <ClInclude Include="..\..\..\..\include\isc\netscope.h" />
     <ClInclude Include="..\..\..\..\include\lib_strbuf.h" />
     <ClInclude Include="..\..\..\..\include\l_stdlib.h" />
-    <ClInclude Include="..\..\..\..\include\md5.h" />
     <ClInclude Include="..\..\..\..\include\ntp.h" />
     <ClInclude Include="..\..\..\..\include\ntpd.h" />
     <ClInclude Include="..\..\..\..\include\ntp_assert.h" />
@@ -365,7 +361,11 @@
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\hash.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\md5.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\netscope.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\ondestroy.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\task.h" />
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\condition.h" />
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" />
@@ -376,21 +376,19 @@
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stdtime.h" />
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\thread.h" />
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\time.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h" />
     <ClInclude Include="..\..\..\..\sntp\libopts\ag-char-map.h" />
     <ClInclude Include="..\..\include\arpa\inet.h" />
     <ClInclude Include="..\..\include\clockstuff.h" />
     <ClInclude Include="..\..\include\config.h" />
     <ClInclude Include="..\..\include\gaa_compat.h" />
-    <ClInclude Include="..\..\include\isc\win32os.h" />
     <ClInclude Include="..\..\include\netdb.h" />
-    <ClInclude Include="..\..\include\netinet\in.h" />
     <ClInclude Include="..\..\include\ntp_iocompletionport.h" />
     <ClInclude Include="..\..\include\ntp_timer.h" />
     <ClInclude Include="..\..\include\syslog.h" />
     <ClInclude Include="..\..\include\sys\ioctl.h" />
     <ClInclude Include="..\..\include\sys\resource.h" />
     <ClInclude Include="..\..\include\sys\signal.h" />
-    <ClInclude Include="..\..\include\sys\socket.h" />
     <ClInclude Include="..\..\include\sys\time.h" />
     <ClInclude Include="..\..\include\termios.h" />
     <ClInclude Include="..\..\include\win32_io.h" />
diff --git a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
index a30dd4400..36fe23d89 100644
--- a/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
+++ b/ports/winnt/vs2013/libntp/libntp.vcxproj.filters
@@ -352,18 +352,12 @@
     <ClInclude Include="..\..\include\gaa_compat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\global.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\hash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\..\include\ieee754io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\netinet\in.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\arpa\inet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -391,9 +385,6 @@
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\md5.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\isc\mem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -403,15 +394,9 @@
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\isc\netaddr.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\netdb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\isc\netscope.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\ntp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -514,9 +499,6 @@
     <ClInclude Include="..\..\include\sys\signal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\sys\socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\stat.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -556,12 +538,24 @@
     <ClInclude Include="..\..\include\win32_io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\isc\win32os.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\libntp\messages.h">
       <Filter>Generated Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\md5.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\netscope.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\libntp\messages.mc">
diff --git a/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat b/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat
index 4d4f92884..b56632738 100644
--- a/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat
+++ b/ports/winnt/vs2013/ntpd/gen-ntp_keyword.bat
@@ -4,25 +4,37 @@ REM helper to invoke keyword-gen and possibly update ntp_keyword.h
 REM Usage:
 REM   gen-ntp_keyword dir_containing_keyword-gen.exe
 REM
-if "x%1"=="x" goto Usage
+
+set HDR_FILE=..\..\..\..\ntpd\ntp_keyword.h
+set UTD_FILE=..\..\..\..\ntpd\keyword-gen-utd
+
+if "{%1}" == "{}" goto Usage
 if not exist "%1\keyword-gen.exe" goto ExeNotFound
 "%1\keyword-gen.exe" ..\..\..\..\ntpd\ntp_parser.h > new_keyword.h
+
+REM check if we must create both files from scratch
+if not exist "%HDR_FILE%" goto createFiles
+if not exist "%UTD_FILE%" goto createFiles
+
 findstr /v diff_ignore_line new_keyword.h > new_keyword_cmp.h
-findstr /v diff_ignore_line ..\..\..\..\ntpd\ntp_keyword.h > ntp_keyword_cmp.h
+findstr /v diff_ignore_line "%HDR_FILE%"  > ntp_keyword_cmp.h
 set meat_changed=0
 fc /L ntp_keyword_cmp.h new_keyword_cmp.h > NUL
 if errorlevel 1 set meat_changed=1
 del ntp_keyword_cmp.h new_keyword_cmp.h
 if "0"=="%meat_changed%" goto SkipUpdate
-copy /y /v new_keyword.h ..\..\..\..\ntpd\ntp_keyword.h
-findstr diff_ignore_line new_keyword.h > ..\..\..\..\ntpd\keyword-gen-utd
+
+:createFiles
+copy /y /v new_keyword.h "%HDR_FILE%"  > NUL
+findstr diff_ignore_line new_keyword.h > "%UTD_FILE%"
 echo updated keyword-gen-utd and ntp_keyword.h
 goto SkipSkipMsg
 
 :skipUpdate
 echo ntp_keyword.h is unchanged
-REM 'touch' the file by replacing it with a concatenation of itself and NUL:
-copy /b ..\..\..\..\ntpd\ntp_keyword.h+NUL: ..\..\..\..\ntpd\ntp_keyword.h
+REM 'touch' the files by replacing them with a concatenation of itself and NUL:
+copy /b "%HDR_FILE%" + NUL "%HDR_FILE%" > NUL
+copy /b "%UTD_FILE%" + NUL "%UTD_FILE%" > NUL
 
 :SkipSkipMsg
 set meat_changed=
diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj b/ports/winnt/vs2013/ntpd/ntpd.vcxproj
index a88b1a8d7..d6ef87b2e 100644
--- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj
+++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj
@@ -374,9 +374,17 @@
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\assertions.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\boolean.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h" />
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\result.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\int.h" />
     <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\ipv6.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\netdb.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\offset.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\platform.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h" />
     <ClInclude Include="..\..\..\..\ntpd\declcond.h" />
     <ClInclude Include="..\..\..\..\ntpd\jupiter.h" />
     <ClInclude Include="..\..\..\..\ntpd\ntpd-opts.h" />
@@ -422,24 +430,15 @@
     <ClInclude Include="..\..\..\..\ntpd\ntp_scanner.h" />
     <ClInclude Include="..\..\..\..\ntpd\refclock_palisade.h" />
     <ClInclude Include="..\..\..\..\sntp\libopts\autoopts\options.h" />
-    <ClInclude Include="..\..\..\libntp\log.h" />
     <ClInclude Include="..\..\include\arpa\inet.h" />
     <ClInclude Include="..\..\include\clockstuff.h" />
     <ClInclude Include="..\..\include\config.h" />
     <ClInclude Include="..\..\include\hopf_PCI_io.h" />
-    <ClInclude Include="..\..\include\isc\int.h" />
-    <ClInclude Include="..\..\include\isc\net.h" />
-    <ClInclude Include="..\..\include\isc\offset.h" />
-    <ClInclude Include="..\..\include\isc\platform.h" />
-    <ClInclude Include="..\..\include\isc\win32os.h" />
-    <ClInclude Include="..\..\include\netdb.h" />
-    <ClInclude Include="..\..\include\netinet\in.h" />
     <ClInclude Include="..\..\include\ntp_iocompletionport.h" />
     <ClInclude Include="..\..\include\ntp_timer.h" />
     <ClInclude Include="..\..\include\ntservice.h" />
     <ClInclude Include="..\..\include\syslog.h" />
     <ClInclude Include="..\..\include\sys\param.h" />
-    <ClInclude Include="..\..\include\sys\socket.h" />
     <ClInclude Include="..\..\include\sys\wait.h" />
     <ClInclude Include="..\..\include\termios.h" />
     <ClInclude Include="..\..\include\timepps.h" />
diff --git a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
index fc14e36a5..32c119309 100644
--- a/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
+++ b/ports/winnt/vs2013/ntpd/ntpd.vcxproj.filters
@@ -317,15 +317,9 @@
     <ClInclude Include="..\..\..\..\include\ieee754io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\netinet\in.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\arpa\inet.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\isc\int.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\interfaceiter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -341,21 +335,12 @@
     <ClInclude Include="..\..\..\..\include\l_stdlib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\libntp\log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\mbg_gps166.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\isc\net.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\netaddr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\netdb.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\ntp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -473,18 +458,12 @@
     <ClInclude Include="..\..\include\ntservice.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\isc\offset.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\sntp\libopts\autoopts\options.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\sys\param.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\isc\platform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\recvbuff.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -494,9 +473,6 @@
     <ClInclude Include="..\..\..\..\lib\isc\include\isc\result.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\sys\socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\syslog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -518,7 +494,28 @@
     <ClInclude Include="..\..\include\win32_io.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\isc\win32os.h">
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\win32os.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\socket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\platform.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\offset.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\netdb.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\include\isc\log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\int.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj
index 2f39bdf33..ccf5debfd 100644
--- a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj
+++ b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj
@@ -242,9 +242,9 @@
     <ClInclude Include="..\..\..\..\include\ntp_string.h" />
     <ClInclude Include="..\..\..\..\include\ntp_syslog.h" />
     <ClInclude Include="..\..\..\..\include\ntp_unixtime.h" />
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h" />
     <ClInclude Include="..\..\..\..\ntpdate\ntpdate.h" />
     <ClInclude Include="..\..\include\config.h" />
-    <ClInclude Include="..\..\include\isc\net.h" />
     <ClInclude Include="..\..\include\syslog.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters
index e52c61346..8eea86e57 100644
--- a/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters
+++ b/ports/winnt/vs2013/ntpdate/ntpdate.vcxproj.filters
@@ -26,9 +26,6 @@
     <ClInclude Include="..\..\include\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\isc\net.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\ntp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -65,6 +62,9 @@
     <ClInclude Include="..\..\include\syslog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\..\lib\isc\win32\include\isc\net.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\..\..\packageinfo.sh" />