From: Guenter Knauf <fuankg@apache.org>
Date: Thu, 9 Aug 2012 12:11:09 +0000 (+0000)
Subject: NetWare build tweaks.
X-Git-Tag: 2.5.0-alpha~6454
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7814748ab324b8d7329fb3fcbbd8032fb2dcb6a7;p=thirdparty%2Fapache%2Fhttpd.git

NetWare build tweaks.
Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371177 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/NWGNUmakefile b/NWGNUmakefile
index 0ceff3eea5d..7c3b5aaa296 100644
--- a/NWGNUmakefile
+++ b/NWGNUmakefile
@@ -62,18 +62,10 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(SRC)/include \
-			$(STDMOD)/aaa \
 			$(STDMOD)/core \
 			$(STDMOD)/filters \
 			$(STDMOD)/generators \
-			$(STDMOD)/http \
-			$(STDMOD)/loggers \
-			$(STDMOD)/mappers \
 			$(STDMOD)/proxy \
-			$(STDMOD)/ssl \
-			$(SERVER) \
-			$(SERVER)/mpm/netware \
-			$(PCRE) \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUaccesscompat b/modules/aaa/NWGNUaccesscompat
index bfa7b201051..24b129652d1 100644
--- a/modules/aaa/NWGNUaccesscompat
+++ b/modules/aaa/NWGNUaccesscompat
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUallowmethods b/modules/aaa/NWGNUallowmethods
index c2373f574b1..aef151ba876 100644
--- a/modules/aaa/NWGNUallowmethods
+++ b/modules/aaa/NWGNUallowmethods
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthbasc b/modules/aaa/NWGNUauthbasc
index 1f434640bbb..16fe37f7104 100644
--- a/modules/aaa/NWGNUauthbasc
+++ b/modules/aaa/NWGNUauthbasc
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthdigt b/modules/aaa/NWGNUauthdigt
index 39738f21996..0450bdf8ca4 100644
--- a/modules/aaa/NWGNUauthdigt
+++ b/modules/aaa/NWGNUauthdigt
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthform b/modules/aaa/NWGNUauthform
index 5b42ab50c44..28239b7e531 100644
--- a/modules/aaa/NWGNUauthform
+++ b/modules/aaa/NWGNUauthform
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(STDMOD)/session \
 			$(STDMOD)/filters \
diff --git a/modules/aaa/NWGNUauthnano b/modules/aaa/NWGNUauthnano
index b115314d8bf..0618223fd0e 100644
--- a/modules/aaa/NWGNUauthnano
+++ b/modules/aaa/NWGNUauthnano
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthndbd b/modules/aaa/NWGNUauthndbd
index 151bc1c2d08..859c034aa64 100644
--- a/modules/aaa/NWGNUauthndbd
+++ b/modules/aaa/NWGNUauthndbd
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
-			$(AP_WORK)/modules/database \
+			$(STDMOD)/database \
 			$(EOLIST)
 
 #
diff --git a/modules/aaa/NWGNUauthndbm b/modules/aaa/NWGNUauthndbm
index 1f9880e9aab..1c1a1153ddd 100644
--- a/modules/aaa/NWGNUauthndbm
+++ b/modules/aaa/NWGNUauthndbm
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthnfil b/modules/aaa/NWGNUauthnfil
index cfab2876971..acd6981f0f8 100644
--- a/modules/aaa/NWGNUauthnfil
+++ b/modules/aaa/NWGNUauthnfil
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthnsocache b/modules/aaa/NWGNUauthnsocache
index 8d1b347e266..df8150c53aa 100644
--- a/modules/aaa/NWGNUauthnsocache
+++ b/modules/aaa/NWGNUauthnsocache
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthnzldap b/modules/aaa/NWGNUauthnzldap
index bfe21dbedef..473640de0dc 100644
--- a/modules/aaa/NWGNUauthnzldap
+++ b/modules/aaa/NWGNUauthnzldap
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthzdbd b/modules/aaa/NWGNUauthzdbd
index 3ea2ba72ba4..65c3bf7f0a4 100644
--- a/modules/aaa/NWGNUauthzdbd
+++ b/modules/aaa/NWGNUauthzdbd
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(STDMOD)/database \
 			$(EOLIST)
diff --git a/modules/aaa/NWGNUauthzdbm b/modules/aaa/NWGNUauthzdbm
index 3d0ed8f57bc..dd987ba4d17 100644
--- a/modules/aaa/NWGNUauthzdbm
+++ b/modules/aaa/NWGNUauthzdbm
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthzgrp b/modules/aaa/NWGNUauthzgrp
index 4a8df2cb9b4..6e6e8ea13c0 100644
--- a/modules/aaa/NWGNUauthzgrp
+++ b/modules/aaa/NWGNUauthzgrp
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/aaa/NWGNUauthzusr b/modules/aaa/NWGNUauthzusr
index aa790538ad4..c878133e1b6 100644
--- a/modules/aaa/NWGNUauthzusr
+++ b/modules/aaa/NWGNUauthzusr
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/apreq/NWGNUmakefile b/modules/apreq/NWGNUmakefile
index 0e46e3c4acf..8a0cc00d6bc 100644
--- a/modules/apreq/NWGNUmakefile
+++ b/modules/apreq/NWGNUmakefile
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUcach_dsk b/modules/cache/NWGNUcach_dsk
index 1c45f344f0a..e75b4ee3d60 100644
--- a/modules/cache/NWGNUcach_dsk
+++ b/modules/cache/NWGNUcach_dsk
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUmod_cach b/modules/cache/NWGNUmod_cach
index b17b6b69b3b..4da6fed216c 100644
--- a/modules/cache/NWGNUmod_cach
+++ b/modules/cache/NWGNUmod_cach
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUsocachdbm b/modules/cache/NWGNUsocachdbm
index dc06af7df91..3213e36448f 100644
--- a/modules/cache/NWGNUsocachdbm
+++ b/modules/cache/NWGNUsocachdbm
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUsocachmem b/modules/cache/NWGNUsocachmem
index d8d10d8a345..5a032f62fe3 100644
--- a/modules/cache/NWGNUsocachmem
+++ b/modules/cache/NWGNUsocachmem
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cache/NWGNUsocachshmcb b/modules/cache/NWGNUsocachshmcb
index 8f11c4b648d..02f6cab83fd 100644
--- a/modules/cache/NWGNUsocachshmcb
+++ b/modules/cache/NWGNUsocachshmcb
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cluster/NWGNUmodheartbeat b/modules/cluster/NWGNUmodheartbeat
index b2c3ece2192..bbabe566e35 100644
--- a/modules/cluster/NWGNUmodheartbeat
+++ b/modules/cluster/NWGNUmodheartbeat
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/core \
+			$(SRC)/include \
+			$(STDMOD)/core \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/cluster/NWGNUmodheartmonitor b/modules/cluster/NWGNUmodheartmonitor
index 2436b277fde..59fae081156 100644
--- a/modules/cluster/NWGNUmodheartmonitor
+++ b/modules/cluster/NWGNUmodheartmonitor
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/core \
+			$(SRC)/include \
+			$(STDMOD)/core \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/database/NWGNUmakefile b/modules/database/NWGNUmakefile
index 7a96c04e83c..c5a3f206a05 100644
--- a/modules/database/NWGNUmakefile
+++ b/modules/database/NWGNUmakefile
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/dav/fs/NWGNUmakefile b/modules/dav/fs/NWGNUmakefile
index e4024287815..9f609dbf292 100644
--- a/modules/dav/fs/NWGNUmakefile
+++ b/modules/dav/fs/NWGNUmakefile
@@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
-			$(AP_WORK)/modules/dav/main \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
+			$(STDMOD)/dav/main \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/dav/lock/NWGNUmakefile b/modules/dav/lock/NWGNUmakefile
index b515d272c5b..28e6c953ad7 100644
--- a/modules/dav/lock/NWGNUmakefile
+++ b/modules/dav/lock/NWGNUmakefile
@@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
-			$(AP_WORK)/modules/dav/main \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
+			$(STDMOD)/dav/main \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/dav/main/NWGNUmakefile b/modules/dav/main/NWGNUmakefile
index bc94a2215b4..a5b28c92c53 100644
--- a/modules/dav/main/NWGNUmakefile
+++ b/modules/dav/main/NWGNUmakefile
@@ -25,8 +25,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/debugging/NWGNUmodbucketeer b/modules/debugging/NWGNUmodbucketeer
index 22a2d1101ed..788cd7ceac7 100644
--- a/modules/debugging/NWGNUmodbucketeer
+++ b/modules/debugging/NWGNUmodbucketeer
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/debugging/NWGNUmoddumpio b/modules/debugging/NWGNUmoddumpio
index b09fa05c869..50ac42239c6 100644
--- a/modules/debugging/NWGNUmoddumpio
+++ b/modules/debugging/NWGNUmoddumpio
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/debugging/NWGNUmodfirehose b/modules/debugging/NWGNUmodfirehose
index 585fd4c1a22..962b6730f1b 100644
--- a/modules/debugging/NWGNUmodfirehose
+++ b/modules/debugging/NWGNUmodfirehose
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/modules/echo/NWGNUmakefile b/modules/echo/NWGNUmakefile
index 7add53d6371..6fbb1836b5f 100644
--- a/modules/echo/NWGNUmakefile
+++ b/modules/echo/NWGNUmakefile
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/examples/NWGNUcase_flt b/modules/examples/NWGNUcase_flt
index df9a86f4989..469fd0f611c 100644
--- a/modules/examples/NWGNUcase_flt
+++ b/modules/examples/NWGNUcase_flt
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/examples/NWGNUcase_flt_in b/modules/examples/NWGNUcase_flt_in
index 7429a44a03d..3e7b85bf3f6 100644
--- a/modules/examples/NWGNUcase_flt_in
+++ b/modules/examples/NWGNUcase_flt_in
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/examples/NWGNUexample_hooks b/modules/examples/NWGNUexample_hooks
index 06bc16ad056..6888f3057ea 100644
--- a/modules/examples/NWGNUexample_hooks
+++ b/modules/examples/NWGNUexample_hooks
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/examples/NWGNUexample_ipc b/modules/examples/NWGNUexample_ipc
index 605794b2a4a..45fc48c2fe7 100644
--- a/modules/examples/NWGNUexample_ipc
+++ b/modules/examples/NWGNUexample_ipc
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/server/mpm/netware \
+			$(SRC)/include \
+			$(SERVER)/mpm/netware \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/experimental/NWGNUnoloris b/modules/experimental/NWGNUnoloris
index d1a9a96c046..5f3af566d2e 100644
--- a/modules/experimental/NWGNUnoloris
+++ b/modules/experimental/NWGNUnoloris
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUcharsetl b/modules/filters/NWGNUcharsetl
index 99326354d66..c0ef69e3721 100644
--- a/modules/filters/NWGNUcharsetl
+++ b/modules/filters/NWGNUcharsetl
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUdeflate b/modules/filters/NWGNUdeflate
index 7f7204d13e7..3d72a00b722 100644
--- a/modules/filters/NWGNUdeflate
+++ b/modules/filters/NWGNUdeflate
@@ -29,7 +29,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/modules/filters/NWGNUextfiltr b/modules/filters/NWGNUextfiltr
index 1fd57cb00c8..d138148120f 100644
--- a/modules/filters/NWGNUextfiltr
+++ b/modules/filters/NWGNUextfiltr
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUmod_data b/modules/filters/NWGNUmod_data
index 7f46e9aaf74..98ea0017f63 100644
--- a/modules/filters/NWGNUmod_data
+++ b/modules/filters/NWGNUmod_data
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUmod_filter b/modules/filters/NWGNUmod_filter
index bf323ee753b..b8b2b3cfb6a 100644
--- a/modules/filters/NWGNUmod_filter
+++ b/modules/filters/NWGNUmod_filter
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUmod_request b/modules/filters/NWGNUmod_request
index 21f53cc140c..83274ac8074 100644
--- a/modules/filters/NWGNUmod_request
+++ b/modules/filters/NWGNUmod_request
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUmodbuffer b/modules/filters/NWGNUmodbuffer
index 7652a358f40..9c73a6cb058 100644
--- a/modules/filters/NWGNUmodbuffer
+++ b/modules/filters/NWGNUmodbuffer
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUmodsed b/modules/filters/NWGNUmodsed
index 158acb9d77c..351f3f24872 100644
--- a/modules/filters/NWGNUmodsed
+++ b/modules/filters/NWGNUmodsed
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUproxyhtml b/modules/filters/NWGNUproxyhtml
index 5337f3b1a98..3976fbdd10f 100644
--- a/modules/filters/NWGNUproxyhtml
+++ b/modules/filters/NWGNUproxyhtml
@@ -19,8 +19,8 @@ XINCDIRS	+= \
 			$(LIBXML2SDK)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUratelimit b/modules/filters/NWGNUratelimit
index f75c81408dc..89e7a64d1d1 100644
--- a/modules/filters/NWGNUratelimit
+++ b/modules/filters/NWGNUratelimit
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUreflector b/modules/filters/NWGNUreflector
index 67ca26d9de3..12787116f67 100644
--- a/modules/filters/NWGNUreflector
+++ b/modules/filters/NWGNUreflector
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUreqtimeout b/modules/filters/NWGNUreqtimeout
index a99f82c4247..91e579e2940 100644
--- a/modules/filters/NWGNUreqtimeout
+++ b/modules/filters/NWGNUreqtimeout
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUsubstitute b/modules/filters/NWGNUsubstitute
index e5775f285dc..898e6a59c31 100644
--- a/modules/filters/NWGNUsubstitute
+++ b/modules/filters/NWGNUsubstitute
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/filters/NWGNUxml2enc b/modules/filters/NWGNUxml2enc
index 117832eb48c..bfbb5583b86 100644
--- a/modules/filters/NWGNUxml2enc
+++ b/modules/filters/NWGNUxml2enc
@@ -27,7 +27,7 @@ XINCDIRS	+= \
 			$(LIBXML2SDK)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/generators/NWGNUautoindex b/modules/generators/NWGNUautoindex
index e8080c36597..514d935db46 100644
--- a/modules/generators/NWGNUautoindex
+++ b/modules/generators/NWGNUautoindex
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/generators/NWGNUinfo b/modules/generators/NWGNUinfo
index 810db8a2351..ae6f902ed81 100644
--- a/modules/generators/NWGNUinfo
+++ b/modules/generators/NWGNUinfo
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/generators/NWGNUmod_asis b/modules/generators/NWGNUmod_asis
index c7df5ae8e68..504e870d515 100644
--- a/modules/generators/NWGNUmod_asis
+++ b/modules/generators/NWGNUmod_asis
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/generators/NWGNUmod_cgi b/modules/generators/NWGNUmod_cgi
index bbb95784b84..77683eb6fa3 100644
--- a/modules/generators/NWGNUmod_cgi
+++ b/modules/generators/NWGNUmod_cgi
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/filters \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/filters \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/generators/NWGNUstatus b/modules/generators/NWGNUstatus
index 1dc850e28aa..5fa0a8eb418 100644
--- a/modules/generators/NWGNUstatus
+++ b/modules/generators/NWGNUstatus
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/ldap/NWGNUmakefile b/modules/ldap/NWGNUmakefile
index ef830253f3f..dd5890ea784 100644
--- a/modules/ldap/NWGNUmakefile
+++ b/modules/ldap/NWGNUmakefile
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(LDAPSDK)/inc \
 			$(EOLIST)
diff --git a/modules/loggers/NWGNUforensic b/modules/loggers/NWGNUforensic
index c55f036cee5..3882ba08917 100644
--- a/modules/loggers/NWGNUforensic
+++ b/modules/loggers/NWGNUforensic
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/loggers/NWGNUlogdebug b/modules/loggers/NWGNUlogdebug
index e92839a1e55..091c6de8d1b 100644
--- a/modules/loggers/NWGNUlogdebug
+++ b/modules/loggers/NWGNUlogdebug
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/loggers/NWGNUmodlogio b/modules/loggers/NWGNUmodlogio
index fa376db73ad..9fa045264a5 100644
--- a/modules/loggers/NWGNUmodlogio
+++ b/modules/loggers/NWGNUmodlogio
@@ -26,8 +26,8 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/lua/NWGNUmakefile b/modules/lua/NWGNUmakefile
index 36d0a699b48..ac962c9e93c 100644
--- a/modules/lua/NWGNUmakefile
+++ b/modules/lua/NWGNUmakefile
@@ -26,9 +26,9 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(LUASRC)/src \
 			$(EOLIST)
diff --git a/modules/mappers/NWGNUactions b/modules/mappers/NWGNUactions
index 3a94773cd1a..8867246251e 100644
--- a/modules/mappers/NWGNUactions
+++ b/modules/mappers/NWGNUactions
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/mappers/NWGNUimagemap b/modules/mappers/NWGNUimagemap
index 7f6608600cf..ea8b7dff878 100644
--- a/modules/mappers/NWGNUimagemap
+++ b/modules/mappers/NWGNUimagemap
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/mappers/NWGNUrewrite b/modules/mappers/NWGNUrewrite
index d16dd8e2bb9..d8ff191a292 100644
--- a/modules/mappers/NWGNUrewrite
+++ b/modules/mappers/NWGNUrewrite
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/database \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/database \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/mappers/NWGNUspeling b/modules/mappers/NWGNUspeling
index 6982988dad0..6d8303416aa 100644
--- a/modules/mappers/NWGNUspeling
+++ b/modules/mappers/NWGNUspeling
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/mappers/NWGNUuserdir b/modules/mappers/NWGNUuserdir
index b0fc7a01ded..c986e4f8631 100644
--- a/modules/mappers/NWGNUuserdir
+++ b/modules/mappers/NWGNUuserdir
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/mappers/NWGNUvhost b/modules/mappers/NWGNUvhost
index d3b655c698c..db7b1b3c040 100644
--- a/modules/mappers/NWGNUvhost
+++ b/modules/mappers/NWGNUvhost
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUcernmeta b/modules/metadata/NWGNUcernmeta
index 64a7cb7a911..b204e00331d 100644
--- a/modules/metadata/NWGNUcernmeta
+++ b/modules/metadata/NWGNUcernmeta
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUexpires b/modules/metadata/NWGNUexpires
index e9601b0edb1..e80e5d1abad 100644
--- a/modules/metadata/NWGNUexpires
+++ b/modules/metadata/NWGNUexpires
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUheaders b/modules/metadata/NWGNUheaders
index 77ae60d1b8a..69464ec1a96 100644
--- a/modules/metadata/NWGNUheaders
+++ b/modules/metadata/NWGNUheaders
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUmimemagi b/modules/metadata/NWGNUmimemagi
index ae508fffab1..0e3225ea42a 100644
--- a/modules/metadata/NWGNUmimemagi
+++ b/modules/metadata/NWGNUmimemagi
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUmodident b/modules/metadata/NWGNUmodident
index 8ce871d8326..b8f364fe8bb 100644
--- a/modules/metadata/NWGNUmodident
+++ b/modules/metadata/NWGNUmodident
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUmodversion b/modules/metadata/NWGNUmodversion
index 756b57212ba..12a76716239 100644
--- a/modules/metadata/NWGNUmodversion
+++ b/modules/metadata/NWGNUmodversion
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUremoteip b/modules/metadata/NWGNUremoteip
index 8e9ddb5921d..115bbb9f7cc 100644
--- a/modules/metadata/NWGNUremoteip
+++ b/modules/metadata/NWGNUremoteip
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUuniqueid b/modules/metadata/NWGNUuniqueid
index d39a57e1fa5..bb72a6bb3d1 100644
--- a/modules/metadata/NWGNUuniqueid
+++ b/modules/metadata/NWGNUuniqueid
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/metadata/NWGNUusertrk b/modules/metadata/NWGNUusertrk
index 1be79de1570..10c9f2e69e1 100644
--- a/modules/metadata/NWGNUusertrk
+++ b/modules/metadata/NWGNUusertrk
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxy b/modules/proxy/NWGNUproxy
index cade4acbf59..deb5232c340 100644
--- a/modules/proxy/NWGNUproxy
+++ b/modules/proxy/NWGNUproxy
@@ -18,10 +18,10 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/generators \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyajp b/modules/proxy/NWGNUproxyajp
index 0f41248444e..9fc0ef22120 100644
--- a/modules/proxy/NWGNUproxyajp
+++ b/modules/proxy/NWGNUproxyajp
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxybalancer b/modules/proxy/NWGNUproxybalancer
index 976fd50c0f0..277dcbd490f 100644
--- a/modules/proxy/NWGNUproxybalancer
+++ b/modules/proxy/NWGNUproxybalancer
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxycon b/modules/proxy/NWGNUproxycon
index 0215a499dc8..614293181a3 100644
--- a/modules/proxy/NWGNUproxycon
+++ b/modules/proxy/NWGNUproxycon
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyexpress b/modules/proxy/NWGNUproxyexpress
index 84bb5036a82..1c34133a8b5 100644
--- a/modules/proxy/NWGNUproxyexpress
+++ b/modules/proxy/NWGNUproxyexpress
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyfcgi b/modules/proxy/NWGNUproxyfcgi
index a4412225cce..a3ecf4cb859 100644
--- a/modules/proxy/NWGNUproxyfcgi
+++ b/modules/proxy/NWGNUproxyfcgi
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyftp b/modules/proxy/NWGNUproxyftp
index ee7fbf89ec6..27fee00a69d 100644
--- a/modules/proxy/NWGNUproxyftp
+++ b/modules/proxy/NWGNUproxyftp
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyhtp b/modules/proxy/NWGNUproxyhtp
index 0257d52a3f6..5c4f8932b3f 100644
--- a/modules/proxy/NWGNUproxyhtp
+++ b/modules/proxy/NWGNUproxyhtp
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_busy b/modules/proxy/NWGNUproxylbm_busy
index c1b91f6b4f0..fff1db75617 100644
--- a/modules/proxy/NWGNUproxylbm_busy
+++ b/modules/proxy/NWGNUproxylbm_busy
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_hb b/modules/proxy/NWGNUproxylbm_hb
index 19563da6df4..35a7348a2c3 100644
--- a/modules/proxy/NWGNUproxylbm_hb
+++ b/modules/proxy/NWGNUproxylbm_hb
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_req b/modules/proxy/NWGNUproxylbm_req
index 6a2c4cd0fb0..5d41f78a1a9 100644
--- a/modules/proxy/NWGNUproxylbm_req
+++ b/modules/proxy/NWGNUproxylbm_req
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxylbm_traf b/modules/proxy/NWGNUproxylbm_traf
index 1927d6263c1..61b14c09605 100644
--- a/modules/proxy/NWGNUproxylbm_traf
+++ b/modules/proxy/NWGNUproxylbm_traf
@@ -18,9 +18,9 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/proxy \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/proxy \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUproxyscgi b/modules/proxy/NWGNUproxyscgi
index 9068c69e147..2445fd3f20e 100644
--- a/modules/proxy/NWGNUproxyscgi
+++ b/modules/proxy/NWGNUproxyscgi
@@ -18,8 +18,8 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
+			$(SRC)/include \
+			$(STDMOD)/http \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/proxy/NWGNUserf b/modules/proxy/NWGNUserf
index 0ea3810640f..6c36e7164bb 100644
--- a/modules/proxy/NWGNUserf
+++ b/modules/proxy/NWGNUserf
@@ -37,10 +37,10 @@ XINCDIRS	+= \
 			$(OSSLINC)/openssl \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/http \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/modules/ssl \
+			$(SRC)/include \
+			$(STDMOD)/http \
+			$(STDMOD)/generators \
+			$(STDMOD)/ssl \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/slotmem/NWGNUslotmem_plain b/modules/slotmem/NWGNUslotmem_plain
index a66504a6961..96c925e3ffb 100644
--- a/modules/slotmem/NWGNUslotmem_plain
+++ b/modules/slotmem/NWGNUslotmem_plain
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/slotmem/NWGNUslotmem_shm b/modules/slotmem/NWGNUslotmem_shm
index 515569318da..fe353fca71e 100644
--- a/modules/slotmem/NWGNUslotmem_shm
+++ b/modules/slotmem/NWGNUslotmem_shm
@@ -18,7 +18,7 @@ endif
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/ssl/NWGNUmakefile b/modules/ssl/NWGNUmakefile
index 933180f14a6..836a6d83454 100644
--- a/modules/ssl/NWGNUmakefile
+++ b/modules/ssl/NWGNUmakefile
@@ -52,10 +52,10 @@ XINCDIRS	+= \
 			$(SSL_INC) \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
-			$(AP_WORK)/modules/cache \
-			$(AP_WORK)/modules/generators \
-			$(AP_WORK)/server/mpm/NetWare \
+			$(SRC)/include \
+			$(STDMOD)/cache \
+			$(STDMOD)/generators \
+			$(SERVER)/mpm/NetWare \
 			$(NWOS) \
 			$(EOLIST)
 
@@ -315,7 +315,7 @@ install :: nlms FORCE
 #
 # Any specialized rules here
 #
-vpath %.c $(AP_WORK)/modules/arch/netware
+vpath %.c $(STDMOD)/arch/netware
 
 #
 # Include the 'tail' makefile that has targets that depend on variables defined
diff --git a/modules/test/NWGNUoptfnexport b/modules/test/NWGNUoptfnexport
index 449d26e943a..cdd68b710f8 100644
--- a/modules/test/NWGNUoptfnexport
+++ b/modules/test/NWGNUoptfnexport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/test/NWGNUoptfnimport b/modules/test/NWGNUoptfnimport
index cd09d392e48..316cba7dc98 100644
--- a/modules/test/NWGNUoptfnimport
+++ b/modules/test/NWGNUoptfnimport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/test/NWGNUopthookexport b/modules/test/NWGNUopthookexport
index 04723869f17..fd4790a79b3 100644
--- a/modules/test/NWGNUopthookexport
+++ b/modules/test/NWGNUopthookexport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/modules/test/NWGNUopthookimport b/modules/test/NWGNUopthookimport
index ef4d3dcd7ab..ee9fe59e8af 100644
--- a/modules/test/NWGNUopthookimport
+++ b/modules/test/NWGNUopthookimport
@@ -26,7 +26,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(NWOS) \
 			$(EOLIST)
 
diff --git a/server/NWGNUmakefile b/server/NWGNUmakefile
index 7f96e81e126..3a61094f8e9 100644
--- a/server/NWGNUmakefile
+++ b/server/NWGNUmakefile
@@ -23,7 +23,7 @@ include $(AP_WORK)/build/NWGNUhead.inc
 XINCDIRS	+= \
 			$(NWOS) \
 			$(APR)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(APRUTIL)/include \
 			$(EOLIST)
 
@@ -112,7 +112,7 @@ NLM_THREAD_NAME	= genchars
 
 #
 # If this is specified, it will override VERSION value in 
-# $(AP_WORK)\NWGNUNetWare.rul
+# $(AP_WORK)/build/NWGNUenvironment.inc
 #
 NLM_VERSION	= 1,0,0
 
diff --git a/support/NWGNUab b/support/NWGNUab
index c22b6c16edb..aa10aab42f9 100644
--- a/support/NWGNUab
+++ b/support/NWGNUab
@@ -51,7 +51,7 @@ endif
 
 XINCDIRS	+= \
 			$(NWOS) \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR)/misc/netware \
diff --git a/support/NWGNUfirehose b/support/NWGNUfirehose
index 2b81c15505f..1ad7a7cf5ad 100644
--- a/support/NWGNUfirehose
+++ b/support/NWGNUfirehose
@@ -20,7 +20,7 @@ XINCDIRS	+= \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR)/misc/netware \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(EOLIST)
 
 #
diff --git a/support/NWGNUhtcacheclean b/support/NWGNUhtcacheclean
index f81352781de..ffee90b8281 100644
--- a/support/NWGNUhtcacheclean
+++ b/support/NWGNUhtcacheclean
@@ -19,7 +19,7 @@ XINCDIRS	+= \
 			$(STDMOD)/cache \
 			$(APR)/include \
 			$(APRUTIL)/include \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(APR)/misc/netware \
 			$(NWOS) \
 			$(EOLIST)
diff --git a/support/NWGNUlogres b/support/NWGNUlogres
index 33ccfe0e32d..a19c20d0aaa 100644
--- a/support/NWGNUlogres
+++ b/support/NWGNUlogres
@@ -17,7 +17,7 @@ endif
 #
 XINCDIRS	+= \
 			$(NWOS) \
-			$(AP_WORK)/include \
+			$(SRC)/include \
 			$(APR)/include \
 			$(APRUTIL)/include \
 			$(APR)/misc/netware \