A few changes for Borland

55 files changed, 275 insertions, 275 deletions

diff --git a/tests/Aio_Platform_Test.bpr b/tests/Aio_Platform_Test.bpr
index e440139df4c..11896351db5 100644
--- a/tests/Aio_Platform_Test.bpr
+++ b/tests/Aio_Platform_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Atomic_Op_Test.bpr b/tests/Atomic_Op_Test.bpr
index 99ab9fd978e..8ad0a7fa437 100644
--- a/tests/Atomic_Op_Test.bpr
+++ b/tests/Atomic_Op_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Barrier_Test.bpr b/tests/Barrier_Test.bpr
index bbc60f85f5b..dc3b8702fb9 100644
--- a/tests/Barrier_Test.bpr
+++ b/tests/Barrier_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Basic_Types_Test.bpr b/tests/Basic_Types_Test.bpr
index 85ddfdb0470..fc9192e8d9b 100644
--- a/tests/Basic_Types_Test.bpr
+++ b/tests/Basic_Types_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Buffer_Stream_Test.bpr b/tests/Buffer_Stream_Test.bpr
index 9053b424e4c..5f4b61dea0a 100644
--- a/tests/Buffer_Stream_Test.bpr
+++ b/tests/Buffer_Stream_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Conn_Test.bpr b/tests/Conn_Test.bpr
index a37fb4b1dd2..6b1725e062f 100644
--- a/tests/Conn_Test.bpr
+++ b/tests/Conn_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Enum_Interfaces_Test.bpr b/tests/Enum_Interfaces_Test.bpr
index 013bbc9527e..38fc21c802d 100644
--- a/tests/Enum_Interfaces_Test.bpr
+++ b/tests/Enum_Interfaces_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Env_Value_Test.bpr b/tests/Env_Value_Test.bpr
index 6e092a4b8fd..b58eb881f78 100644
--- a/tests/Env_Value_Test.bpr
+++ b/tests/Env_Value_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Future_Test.bpr b/tests/Future_Test.bpr
index eedcc7f18e2..cd5368a6fe4 100644
--- a/tests/Future_Test.bpr
+++ b/tests/Future_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Handle_Set_Test.bpr b/tests/Handle_Set_Test.bpr
index 1fe56de87cf..0c1996854e7 100644
--- a/tests/Handle_Set_Test.bpr
+++ b/tests/Handle_Set_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Hash_Map_Manager_Test.bpr b/tests/Hash_Map_Manager_Test.bpr
index 27f6e29d727..1d226a3d4d3 100644
--- a/tests/Hash_Map_Manager_Test.bpr
+++ b/tests/Hash_Map_Manager_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/IOStream_Test.bpr b/tests/IOStream_Test.bpr
index 814f55bcbfe..69b2d00f719 100644
--- a/tests/IOStream_Test.bpr
+++ b/tests/IOStream_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/MM_Shared_Memory_Test.bpr b/tests/MM_Shared_Memory_Test.bpr
index bb5a633b8ba..f3bb4b24142 100644
--- a/tests/MM_Shared_Memory_Test.bpr
+++ b/tests/MM_Shared_Memory_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/MT_Reactor_Timer_Test.bpr b/tests/MT_Reactor_Timer_Test.bpr
index a2f0f099ea6..5e0cb83b321 100644
--- a/tests/MT_Reactor_Timer_Test.bpr
+++ b/tests/MT_Reactor_Timer_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/MT_SOCK_Test.bpr b/tests/MT_SOCK_Test.bpr
index f2ad015c1da..91ac9908e93 100644
--- a/tests/MT_SOCK_Test.bpr
+++ b/tests/MT_SOCK_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Map_Manager_Test.bpr b/tests/Map_Manager_Test.bpr
index 44f11e51298..c2b309e99ba 100644
--- a/tests/Map_Manager_Test.bpr
+++ b/tests/Map_Manager_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Mem_Map_Test.bpr b/tests/Mem_Map_Test.bpr
index c8206ef671d..1e33136417d 100644
--- a/tests/Mem_Map_Test.bpr
+++ b/tests/Mem_Map_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Message_Block_Test.bpr b/tests/Message_Block_Test.bpr
index f68bba8877c..df4954d5a60 100644
--- a/tests/Message_Block_Test.bpr
+++ b/tests/Message_Block_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Message_Queue_Notifications_Test.bpr b/tests/Message_Queue_Notifications_Test.bpr
index 517b017fe06..02b0b187c5f 100644
--- a/tests/Message_Queue_Notifications_Test.bpr
+++ b/tests/Message_Queue_Notifications_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Message_Queue_Test.bpr b/tests/Message_Queue_Test.bpr
index 01ca50c9b98..517c10c27ea 100644
--- a/tests/Message_Queue_Test.bpr
+++ b/tests/Message_Queue_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Naming_Test.bpr b/tests/Naming_Test.bpr
index cae70343849..45b3a992ff6 100644
--- a/tests/Naming_Test.bpr
+++ b/tests/Naming_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Notify_Performance_Test.bpr b/tests/Notify_Performance_Test.bpr
index 4ef91b435a3..7e09c8baeda 100644
--- a/tests/Notify_Performance_Test.bpr
+++ b/tests/Notify_Performance_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/OrdMultiSet_Test.bpr b/tests/OrdMultiSet_Test.bpr
index cd789ee613b..af46541807f 100644
--- a/tests/OrdMultiSet_Test.bpr
+++ b/tests/OrdMultiSet_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Pipe_Test.bpr b/tests/Pipe_Test.bpr
index b9fc0d57e04..26208ac8b86 100644
--- a/tests/Pipe_Test.bpr
+++ b/tests/Pipe_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Priority_Buffer_Test.bpr b/tests/Priority_Buffer_Test.bpr
index 73c1a027802..ffa352ed5a1 100644
--- a/tests/Priority_Buffer_Test.bpr
+++ b/tests/Priority_Buffer_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Priority_Reactor_Test.bpr b/tests/Priority_Reactor_Test.bpr
index 0b8c398fa67..631c86df05c 100644
--- a/tests/Priority_Reactor_Test.bpr
+++ b/tests/Priority_Reactor_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Priority_Task_Test.bpr b/tests/Priority_Task_Test.bpr
index 42893138bd7..017dd9ff409 100644
--- a/tests/Priority_Task_Test.bpr
+++ b/tests/Priority_Task_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Process_Mutex_Test.bpr b/tests/Process_Mutex_Test.bpr
index d450ed22903..64714dc08db 100644
--- a/tests/Process_Mutex_Test.bpr
+++ b/tests/Process_Mutex_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Process_Strategy_Test.bpr b/tests/Process_Strategy_Test.bpr
index 08a42285341..4ca6294183b 100644
--- a/tests/Process_Strategy_Test.bpr
+++ b/tests/Process_Strategy_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Reactor_Exceptions_Test.bpr b/tests/Reactor_Exceptions_Test.bpr
index 7a8465151ed..4a6f6ac161a 100644
--- a/tests/Reactor_Exceptions_Test.bpr
+++ b/tests/Reactor_Exceptions_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Reactor_Notify_Test.bpr b/tests/Reactor_Notify_Test.bpr
index 34ef3f87707..32a70afd837 100644
--- a/tests/Reactor_Notify_Test.bpr
+++ b/tests/Reactor_Notify_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Reactor_Performance_Test.bpr b/tests/Reactor_Performance_Test.bpr
index a66564f9b6b..8e9a42efd88 100644
--- a/tests/Reactor_Performance_Test.bpr
+++ b/tests/Reactor_Performance_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Reactor_Timer_Test.bpr b/tests/Reactor_Timer_Test.bpr
index c1ba2333f0b..d9447e40631 100644
--- a/tests/Reactor_Timer_Test.bpr
+++ b/tests/Reactor_Timer_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Reactors_Test.bpr b/tests/Reactors_Test.bpr
index ba22d0543dc..7f0a5303b9d 100644
--- a/tests/Reactors_Test.bpr
+++ b/tests/Reactors_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Reader_Writer_Test.bpr b/tests/Reader_Writer_Test.bpr
index 492251d32b6..cc97a2217e9 100644
--- a/tests/Reader_Writer_Test.bpr
+++ b/tests/Reader_Writer_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Recursive_Mutex_Test.bpr b/tests/Recursive_Mutex_Test.bpr
index 6967d65db97..9f9304c52ab 100644
--- a/tests/Recursive_Mutex_Test.bpr
+++ b/tests/Recursive_Mutex_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/SOCK_Connector_Test.bpr b/tests/SOCK_Connector_Test.bpr
index 59147b9f582..232f0e62129 100644
--- a/tests/SOCK_Connector_Test.bpr
+++ b/tests/SOCK_Connector_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/SOCK_Test.bpr b/tests/SOCK_Test.bpr
index 1a7c1370836..be8362df51a 100644
--- a/tests/SOCK_Test.bpr
+++ b/tests/SOCK_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/SPIPE_Test.bpr b/tests/SPIPE_Test.bpr
index ae00e3a4a82..17b8ede662a 100644
--- a/tests/SPIPE_Test.bpr
+++ b/tests/SPIPE_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/SString_Test.bpr b/tests/SString_Test.bpr
index cdb205aeef4..ec9adae102c 100644
--- a/tests/SString_Test.bpr
+++ b/tests/SString_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/SV_Shared_Memory_Test.bpr b/tests/SV_Shared_Memory_Test.bpr
index 2127833983d..9349f7256be 100644
--- a/tests/SV_Shared_Memory_Test.bpr
+++ b/tests/SV_Shared_Memory_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Semaphore_Test.bpr b/tests/Semaphore_Test.bpr
index 111e93fd0e0..5f2b7c42cef 100644
--- a/tests/Semaphore_Test.bpr
+++ b/tests/Semaphore_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Service_Config_Test.bpr b/tests/Service_Config_Test.bpr
index a0c18fb0e42..ccd4fe76183 100644
--- a/tests/Service_Config_Test.bpr
+++ b/tests/Service_Config_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Sigset_Ops_Test.bpr b/tests/Sigset_Ops_Test.bpr
index 9f3102abc90..c10dd0df3c1 100644
--- a/tests/Sigset_Ops_Test.bpr
+++ b/tests/Sigset_Ops_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Simple_Message_Block_Test.bpr b/tests/Simple_Message_Block_Test.bpr
index 1eff78b2c53..37a92a26e1f 100644
--- a/tests/Simple_Message_Block_Test.bpr
+++ b/tests/Simple_Message_Block_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/TSS_Test.bpr b/tests/TSS_Test.bpr
index 2c828731584..3f0c7be7560 100644
--- a/tests/TSS_Test.bpr
+++ b/tests/TSS_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Task_Test.bpr b/tests/Task_Test.bpr
index 93b504b1a08..afc9e21113e 100644
--- a/tests/Task_Test.bpr
+++ b/tests/Task_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Thread_Manager_Test.bpr b/tests/Thread_Manager_Test.bpr
index d3a14772b23..9346b4d2edc 100644
--- a/tests/Thread_Manager_Test.bpr
+++ b/tests/Thread_Manager_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Thread_Mutex_Test.bpr b/tests/Thread_Mutex_Test.bpr
index 3dceca4bdc0..15aa43311f7 100644
--- a/tests/Thread_Mutex_Test.bpr
+++ b/tests/Thread_Mutex_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Thread_Pool_Test.bpr b/tests/Thread_Pool_Test.bpr
index e8784792d54..1e40616f8ae 100644
--- a/tests/Thread_Pool_Test.bpr
+++ b/tests/Thread_Pool_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Time_Service_Test.bpr b/tests/Time_Service_Test.bpr
index 3c50b02ab7b..c5d5acebd98 100644
--- a/tests/Time_Service_Test.bpr
+++ b/tests/Time_Service_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Time_Value_Test.bpr b/tests/Time_Value_Test.bpr
index 97b507f5506..357360df3f4 100644
--- a/tests/Time_Value_Test.bpr
+++ b/tests/Time_Value_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Timer_Queue_Test.bpr b/tests/Timer_Queue_Test.bpr
index 8c40e595f96..5a818b7de98 100644
--- a/tests/Timer_Queue_Test.bpr
+++ b/tests/Timer_Queue_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/Tokens_Test.bpr b/tests/Tokens_Test.bpr
index 020002a8e81..6cb544e94ae 100644
--- a/tests/Tokens_Test.bpr
+++ b/tests/Tokens_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]
diff --git a/tests/UPIPE_SAP_Test.bpr b/tests/UPIPE_SAP_Test.bpr
index 516e862a90f..71d93dc41b0 100644
--- a/tests/UPIPE_SAP_Test.bpr
+++ b/tests/UPIPE_SAP_Test.bpr
@@ -33,12 +33,12 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -Od -r- -k -y -v -vi- -c -tWC
-CFLAG2 = -D_NO_VCL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+CFLAG2 = -D_NO_VCL -I..;$(BCB)\include
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_NO_VCL -N2obj -N0obj -U$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
-RFLAGS = -D_NO_VCL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
+  -I..;$(BCB)\include -$Y -$W -$O- -v -JPHN -M
+RFLAGS = -D_NO_VCL -i..;$(BCB)\include
+AFLAGS = /i.. /i$(BCB)\include /d_NO_VCL /mx /w2 /zd
 LFLAGS = -L$(BCB)\lib;$(DEBUGLIBPATH) -ap -Tpe -x -Gn -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -77,7 +77,7 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=2
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include
+Item0=..;$(BCB)\include
 Item1=$(ACE_ROOT);$(BCB)\include
 
 [HistoryLists\hlLibraryPath]