This particular change was no good, cannot be referencing

the include path while trying to create the same explicit
target.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1125579 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 153 insertions, 153 deletions

diff --git a/apr.mak b/apr.mak
index 818e77b4f..78bd56a98 100644
--- a/apr.mak
+++ b/apr.mak
@@ -1285,422 +1285,422 @@ LIB32_OBJS= \
 !IF "$(CFG)" == "apr - Win32 Release" || "$(CFG)" == "apr - Win32 Debug" || "$(CFG)" == "apr - Win32 Release9x" || "$(CFG)" == "apr - Win32 Debug9x" || "$(CFG)" == "apr - x64 Release" || "$(CFG)" == "apr - x64 Debug"
 SOURCE=.\atomic\win32\apr_atomic.c
 
-"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\dso\win32\dso.c
 
-"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\buffer.c
 
-"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\copy.c
 
-"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\dir.c
 
-"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fileacc.c
 
-"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filedup.c
 
-"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filepath.c
 
-"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\filepath_util.c
 
-"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filestat.c
 
-"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filesys.c
 
-"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\flock.c
 
-"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fullrw.c
 
-"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\mktemp.c
 
-"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\open.c
 
-"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\pipe.c
 
-"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\readwrite.c
 
-"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\seek.c
 
-"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\tempdir.c
 
-"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\proc_mutex.c
 
-"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_cond.c
 
-"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_mutex.c
 
-"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_rwlock.c
 
-"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\memory\unix\apr_pools.c
 
-"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\apr_app.c
 SOURCE=.\misc\win32\charset.c
 
-"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\env.c
 
-"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\errorcodes.c
 
-"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\getopt.c
 
-"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\internal.c
 
-"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\misc.c
 
-"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\otherchild.c
 
-"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\rand.c
 
-"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\start.c
 
-"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\utf8.c
 
-"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\version.c
 
-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\unix\common.c
 
-"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\win32\mmap.c
 
-"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_ntop.c
 
-"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_pton.c
 
-"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\multicast.c
 
-"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sendrecv.c
 
-"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\sockaddr.c
 
-"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\socket_util.c
 
-"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockets.c
 
-"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockopt.c
 
-"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\passwd\apr_getpass.c
 
-"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\poll.c
 
-"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollcb.c
 
-"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollset.c
 
-"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\select.c
 
-"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\apr_random.c
 
-"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2.c
 
-"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2_glue.c
 
-"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\shmem\win32\shm.c
 
-"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_cpystrn.c
 
-"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_fnmatch.c
 
-"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_snprintf.c
 
-"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strings.c
 
-"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strnatcmp.c
 
-"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strtok.c
 
-"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_hash.c
 
-"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_tables.c
 
-"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\proc.c
 
-"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\signals.c
 
-"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\thread.c
 
-"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\threadpriv.c
 
-"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\time.c
 
-"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\timestr.c
 
-"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\groupinfo.c
 
-"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\userinfo.c
 
-"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -1710,7 +1710,7 @@ SOURCE=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1721,7 +1721,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1732,7 +1732,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1743,7 +1743,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1754,7 +1754,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1765,7 +1765,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
diff --git a/libapr.mak b/libapr.mak
index 10be02fea..fef3a4820 100644
--- a/libapr.mak
+++ b/libapr.mak
@@ -1417,422 +1417,422 @@ OutDir=.\x64\Debug
 !IF "$(CFG)" == "libapr - Win32 Release" || "$(CFG)" == "libapr - Win32 Debug" || "$(CFG)" == "libapr - Win32 Release9x" || "$(CFG)" == "libapr - Win32 Debug9x" || "$(CFG)" == "libapr - x64 Release" || "$(CFG)" == "libapr - x64 Debug"
 SOURCE=.\atomic\win32\apr_atomic.c
 
-"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_atomic.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\dso\win32\dso.c
 
-"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\dso.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\buffer.c
 
-"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\buffer.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\copy.c
 
-"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\copy.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\dir.c
 
-"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\dir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fileacc.c
 
-"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\fileacc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filedup.c
 
-"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filedup.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filepath.c
 
-"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filepath.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\filepath_util.c
 
-"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filepath_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filestat.c
 
-"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filestat.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\filesys.c
 
-"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\filesys.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\flock.c
 
-"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\flock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\fullrw.c
 
-"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\fullrw.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\mktemp.c
 
-"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\mktemp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\open.c
 
-"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\open.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\pipe.c
 
-"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\pipe.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\readwrite.c
 
-"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\readwrite.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\win32\seek.c
 
-"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\seek.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\file_io\unix\tempdir.c
 
-"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\tempdir.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\proc_mutex.c
 
-"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\proc_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_cond.c
 
-"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread_cond.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_mutex.c
 
-"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread_mutex.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\locks\win32\thread_rwlock.c
 
-"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread_rwlock.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\memory\unix\apr_pools.c
 
-"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_pools.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\apr_app.c
 SOURCE=.\misc\win32\charset.c
 
-"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\charset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\env.c
 
-"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\env.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\errorcodes.c
 
-"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\errorcodes.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\getopt.c
 
-"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\getopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\internal.c
 
-"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\internal.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\misc.c
 
-"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\misc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\otherchild.c
 
-"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\otherchild.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\rand.c
 
-"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\rand.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\start.c
 
-"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\start.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\win32\utf8.c
 
-"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\utf8.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\misc\unix\version.c
 
-"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\version.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\unix\common.c
 
-"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\common.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\mmap\win32\mmap.c
 
-"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\mmap.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_ntop.c
 
-"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\inet_ntop.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\inet_pton.c
 
-"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\inet_pton.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\multicast.c
 
-"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\multicast.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sendrecv.c
 
-"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sendrecv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\sockaddr.c
 
-"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sockaddr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\unix\socket_util.c
 
-"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\socket_util.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockets.c
 
-"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sockets.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\network_io\win32\sockopt.c
 
-"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sockopt.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\passwd\apr_getpass.c
 
-"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_getpass.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\poll.c
 
-"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\poll.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollcb.c
 
-"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\pollcb.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\pollset.c
 
-"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\pollset.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\poll\unix\select.c
 
-"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\select.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\apr_random.c
 
-"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_random.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2.c
 
-"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sha2.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\random\unix\sha2_glue.c
 
-"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\sha2_glue.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\shmem\win32\shm.c
 
-"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\shm.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_cpystrn.c
 
-"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_cpystrn.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_fnmatch.c
 
-"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_fnmatch.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_snprintf.c
 
-"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_snprintf.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strings.c
 
-"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_strings.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strnatcmp.c
 
-"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_strnatcmp.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\strings\apr_strtok.c
 
-"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_strtok.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_hash.c
 
-"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_hash.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\tables\apr_tables.c
 
-"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\apr_tables.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\proc.c
 
-"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\proc.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\signals.c
 
-"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\signals.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\thread.c
 
-"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\thread.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\threadproc\win32\threadpriv.c
 
-"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\threadpriv.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\time.c
 
-"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\time.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\time\win32\timestr.c
 
-"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\timestr.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\groupinfo.c
 
-"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\groupinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
 SOURCE=.\user\win32\userinfo.c
 
-"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\userinfo.obj" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(CPP) $(CPP_PROJ) $(SOURCE)
 
 
@@ -1842,7 +1842,7 @@ SOURCE=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1853,7 +1853,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1864,7 +1864,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1875,7 +1875,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1886,7 +1886,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1897,7 +1897,7 @@ InputPath=.\include\apr.hw
 
 InputPath=.\include\apr.hw
 
-{$(INCLUDE)}"apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+".\include\apr.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	<<tempfile.bat 
 	@echo off 
 	type .\include\apr.hw > .\include\apr.h
@@ -1908,7 +1908,7 @@ InputPath=.\include\apr.hw
 
 SOURCE=.\libapr.rc
 
-"$(INTDIR)\libapr.res" : $(SOURCE) "$(INTDIR)" {$(INCLUDE)}"apr.h"
+"$(INTDIR)\libapr.res" : $(SOURCE) "$(INTDIR)" ".\include\apr.h"
 	$(RSC) $(RSC_PROJ) $(SOURCE)