A few changes for Borland

author: gonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 1998-06-22 07:08:40 +0000
committer: gonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 1998-06-22 07:08:40 +0000
commit: 2d7a7c9bdd96fda2e35f9501ce7224bf3cb17061 (patch)
tree: 71bfe3efd351cc35a86f954ef8639eedf353c6d0
parent: 72709a5ed28debaa1358b3dac81c9925f5d5d9fe (diff)
download: ATCD-2d7a7c9bdd96fda2e35f9501ce7224bf3cb17061.tar.gz
65 files changed, 488 insertions, 395 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 27bc4319546..559896f167d 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,93 @@
+Mon Jun 22 01:14:36 1998  Gonzalo Diethelm  <gonzo@tango.cs.wustl.edu>
+
+	* ace/ACE.bpg: 
+	* ace/ACED.bpr: 
+	* ace/ACER.bpr: 
+	Contained ^M characters.
+	I also made sure there were no absolute paths pointing to "gonzo"
+	directories...
+
+ 	* ace/ACED.cpp: 
+	* ace/ACER.cpp: 
+	Added Stats.cpp as a module in the right place.
+
+	* ace/OS.h: 
+	Added a ACE_NOOP macro to avoid compilation warnings when "if" is
+	used as a noop in certain macros.
+
+	* ace/Hash_Map_Manager.cpp: 
+	* ace/Map_Manager.cpp: 
+	Replaced the use of "if" as a noop with ACE_NOOP.
+
+	* ace/Signal.cpp: 
+	For some obscure reason, Borland needs a blank line between the
+	#if and the extern "C" void ace_sig_handler_dispatch()
+	definition. Don't ask...
+
+	* ace/Asynch_IO.h: 
+	Changed (again) inheritance for ACE_Asynch_Result from protected
+	to public.
+
+	* tests/Aio_Platform_Test.bpr: 
+	* tests/Atomic_Op_Test.bpr: 
+	* tests/Barrier_Test.bpr: 
+	* tests/Basic_Types_Test.bpr: 
+	* tests/Buffer_Stream_Test.bpr: 
+	* tests/Conn_Test.bpr: 
+	* tests/Enum_Interfaces_Test.bpr: 
+	* tests/Env_Value_Test.bpr: 
+	* tests/Future_Test.bpr: 
+	* tests/Handle_Set_Test.bpr: 
+	* tests/Hash_Map_Manager_Test.bpr: 
+	* tests/IOStream_Test.bpr: 
+	* tests/MM_Shared_Memory_Test.bpr: 
+	* tests/MT_Reactor_Timer_Test.bpr: 
+	* tests/MT_SOCK_Test.bpr: 
+	* tests/Map_Manager_Test.bpr: 
+	* tests/Mem_Map_Test.bpr: 
+	* tests/Message_Block_Test.bpr: 
+	* tests/Message_Queue_Notifications_Test.bpr: 
+	* tests/Message_Queue_Test.bpr: 
+	* tests/Naming_Test.bpr: 
+	* tests/Notify_Performance_Test.bpr: 
+	* tests/OrdMultiSet_Test.bpr: 
+	* tests/Pipe_Test.bpr: 
+	* tests/Priority_Buffer_Test.bpr: 
+	* tests/Priority_Reactor_Test.bpr: 
+	* tests/Priority_Task_Test.bpr: 
+	* tests/Process_Mutex_Test.bpr: 
+	* tests/Process_Strategy_Test.bpr: 
+	* tests/Reactor_Exceptions_Test.bpr: 
+	* tests/Reactor_Notify_Test.bpr: 
+	* tests/Reactor_Performance_Test.bpr: 
+	* tests/Reactor_Timer_Test.bpr: 
+	* tests/Reactors_Test.bpr: 
+	* tests/Reader_Writer_Test.bpr: 
+	* tests/Recursive_Mutex_Test.bpr: 
+	* tests/SOCK_Connector_Test.bpr: 
+	* tests/SOCK_Test.bpr: 
+	* tests/SPIPE_Test.bpr: 
+	* tests/SString_Test.bpr: 
+	* tests/SV_Shared_Memory_Test.bpr: 
+	* tests/Semaphore_Test.bpr: 
+	* tests/Service_Config_Test.bpr: 
+	* tests/Sigset_Ops_Test.bpr: 
+	* tests/Simple_Message_Block_Test.bpr: 
+	* tests/TSS_Test.bpr: 
+	* tests/Task_Test.bpr: 
+	* tests/Thread_Manager_Test.bpr: 
+	* tests/Thread_Mutex_Test.bpr: 
+	* tests/Thread_Pool_Test.bpr: 
+	* tests/Time_Service_Test.bpr: 
+	* tests/Time_Value_Test.bpr: 
+	* tests/Timer_Queue_Test.bpr: 
+	* tests/Tokens_Test.bpr: 
+	* tests/UPIPE_SAP_Test.bpr: 
+	* tests/tests.bpg: 
+	Contained ^M characters.
+	I also made sure there were no absolute paths pointing to "gonzo"
+	directories...
+	
 Mon Jun 22 01:33:12 1998  Nanbor Wang  <nanbor@cs.wustl.edu>
 
 	* ace/OS.h (ACE_SYNCH_{1,2}): These two macros were added back for
diff --git a/ace/ACED.bpr b/ace/ACED.bpr
index 93f88595e7b..d303f5f335d 100644
--- a/ace/ACED.bpr
+++ b/ace/ACED.bpr
@@ -48,7 +48,7 @@ OBJFILES = obj\ACED.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj ob
   obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \
   obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \
   obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \
-  obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
+  obj\Stats.obj obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
   obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \
   obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \
   obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \
@@ -81,17 +81,17 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -WD -Od -Hc -w-par -w-inl -Ve -r- -k -y -v -vi- -c -b- -Vx
-CFLAG2 = -D_RTLDLL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl \
+CFLAG2 = -D_RTLDLL -I..;$(BCB)\include;$(BCB)\include\vcl \
   -H=ace.csm
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_RTLDLL -N2obj -N0obj \
-  -Uc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl -$Y -$W \
+  -U.;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
+  -I..;$(BCB)\include;$(BCB)\include\vcl -$Y -$W \
   -$O- -v -JPHN -M
-RFLAGS = -D_RTLDLL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /i$(BCB)\include\vcl \
+RFLAGS = -D_RTLDLL -i..;$(BCB)\include;$(BCB)\include\vcl
+AFLAGS = /i.. /i$(BCB)\include /i$(BCB)\include\vcl \
   /d_RTLDLL /mx /w2 /zi
-LFLAGS = -Lc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
+LFLAGS = -L.;$(BCB)\lib\obj;$(BCB)\lib;$(DEBUGLIBPATH) \
   -aa -Tpd -x -Gn -Gi -v
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -130,11 +130,11 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=1
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
+Item0=..;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
 Count=1
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib
+Item0=.;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
diff --git a/ace/ACED.cpp b/ace/ACED.cpp
index 44c46a46193..3d1a6f9cbd0 100644
--- a/ace/ACED.cpp
+++ b/ace/ACED.cpp
@@ -132,8 +132,8 @@ USEUNIT("SPIPE_Acceptor.cpp");
 USEUNIT("SPIPE_Addr.cpp");
 USEUNIT("SPIPE_Connector.cpp");
 USEUNIT("SPIPE_Stream.cpp");
-USEUNIT("Stats.cpp");
 USEUNIT("SString.cpp");
+USEUNIT("Stats.cpp");
 USEUNIT("Strategies.cpp");
 USEUNIT("Strategies_T.cpp");
 USEUNIT("Stream.cpp");
diff --git a/ace/ACER.bpr b/ace/ACER.bpr
index 3fe61886a42..d7323029beb 100644
--- a/ace/ACER.bpr
+++ b/ace/ACER.bpr
@@ -48,7 +48,7 @@ OBJFILES = obj\ACER.obj obj\ACE.obj obj\Activation_Queue.obj obj\Acceptor.obj ob
   obj\SOCK_Dgram.obj obj\SOCK_Dgram_Bcast.obj obj\SOCK_Dgram_Mcast.obj \
   obj\SOCK_IO.obj obj\SOCK_Stream.obj obj\SPIPE.obj obj\SPIPE_Acceptor.obj \
   obj\SPIPE_Addr.obj obj\SPIPE_Connector.obj obj\SPIPE_Stream.obj obj\SString.obj \
-  obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
+  obj\Stats.obj obj\Strategies.obj obj\Strategies_T.obj obj\Stream.obj obj\Stream_Modules.obj \
   obj\SV_Message.obj obj\SV_Message_Queue.obj obj\SV_Semaphore_Complex.obj \
   obj\SV_Semaphore_Simple.obj obj\SV_Shared_Memory.obj obj\Svc_Conf_l.obj \
   obj\Svc_Conf_y.obj obj\Svc_Handler.obj obj\Synch.obj obj\Synch_Options.obj \
@@ -81,17 +81,17 @@ DEBUGLIBPATH = $(BCB)\lib\debug
 RELEASELIBPATH = $(BCB)\lib\release
 # ---------------------------------------------------------------------------
 CFLAG1 = -WD -O2 -Hc -w-par -w-inl -Ve -k- -vi -c -b- -Vx
-CFLAG2 = -D_RTLDLL -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl \
+CFLAG2 = -D_RTLDLL -I..;$(BCB)\include;$(BCB)\include\vcl \
   -H=obj\ace.csm
 CFLAG3 = -w-rvl -Tkh30000
 PFLAGS = -D_RTLDLL -N2obj -N0obj \
-  -Uc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
-  -Ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl -$L- -$D- \
+  -U..\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
+  -I..;$(BCB)\include;$(BCB)\include\vcl -$L- -$D- \
   -v -JPHN -M
-RFLAGS = -D_RTLDLL -ic:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
-AFLAGS = /ic:\gonzo\ace-4.5.2\ACE_wrappers /i$(BCB)\include /i$(BCB)\include\vcl \
+RFLAGS = -D_RTLDLL -i..;$(BCB)\include;$(BCB)\include\vcl
+AFLAGS = /i.. /i$(BCB)\include /i$(BCB)\include\vcl \
   /d_RTLDLL /mx /w2 /zn
-LFLAGS = -Lc:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
+LFLAGS = -L..\ace;$(BCB)\lib\obj;$(BCB)\lib;$(RELEASELIBPATH) \
   -aa -Tpd -x -Gn -Gi
 IFLAGS =
 # ---------------------------------------------------------------------------
@@ -130,11 +130,11 @@ Comments=
 
 [HistoryLists\hlIncludePath]
 Count=1
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers;$(BCB)\include;$(BCB)\include\vcl
+Item0=..;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
 Count=1
-Item0=c:\gonzo\ace-4.5.2\ACE_wrappers\ace;$(BCB)\lib\obj;$(BCB)\lib
+Item0=..\ace;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
diff --git a/ace/ACER.cpp b/ace/ACER.cpp
index 39dcdf2801e..795933f55cc 100644
--- a/ace/ACER.cpp
+++ b/ace/ACER.cpp
@@ -132,6 +132,7 @@ USEUNIT("SPIPE_Addr.cpp");
 USEUNIT("SPIPE_Connector.cpp");
 USEUNIT("SPIPE_Stream.cpp");
 USEUNIT("SString.cpp");
+USEUNIT("Stats.cpp");
 USEUNIT("Strategies.cpp");
 USEUNIT("Strategies_T.cpp");
 USEUNIT("Stream.cpp");
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index 01766b30bff..8079a0496d2 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -38,7 +38,7 @@ class ACE_Handler;
 class ACE_Message_Block;
 class ACE_INET_Addr;
 
-class ACE_Export ACE_Asynch_Result : protected ACE_OVERLAPPED
+class ACE_Export ACE_Asynch_Result : public ACE_OVERLAPPED
 {
   // = TITLE
   //     An abstract class which adds information to the OVERLAPPED
@@ -82,10 +82,10 @@ public:
   // make sense only when doing file I/O.
 
   ACE_Asynch_Result (ACE_Handler &handler,
-                     const void* act,
-                     ACE_HANDLE event,
-                     u_long offset = 0,
-                     u_long offset_high = 0);
+		     const void* act,
+		     ACE_HANDLE event,
+		     u_long offset = 0,
+		     u_long offset_high = 0);
   // Constructor.
 
   virtual ~ACE_Asynch_Result (void);
@@ -93,9 +93,9 @@ public:
 
 protected:
   virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error = 0) = 0;
+			 int success,
+			 const void *completion_key,
+			 u_long error = 0) = 0;
   // This is the key method.  Subclasses will override this method to
   // call the correct callback on the handler.
 
@@ -129,9 +129,9 @@ class ACE_Export ACE_Asynch_Operation
   //     factor out this code.
 public:
   int open (ACE_Handler &handler,
-            ACE_HANDLE handle = ACE_INVALID_HANDLE,
-            const void *completion_key = 0,
-            ACE_Proactor *proactor = 0);
+	    ACE_HANDLE handle = ACE_INVALID_HANDLE,
+	    const void *completion_key = 0,
+	    ACE_Proactor *proactor = 0);
   // Initializes the factory with information which will be used with
   // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
   // <ACE_Handler::handle> will be called on the <handler> to get the
@@ -187,8 +187,8 @@ public:
   // A do nothing constructor.
 
   int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void *act = 0);
+	    u_long bytes_to_read,
+	    const void *act = 0);
   // This starts off an asynchronous read.  Upto <bytes_to_read> will
   // be read and stored in the <message_block>.
 
@@ -227,18 +227,18 @@ public:
     // These two should really be protected.  But sometimes it
     // simplifies code to be able to "fake" a result.  Use carefully.
     Result (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void* act,
-            ACE_HANDLE event);
+	    ACE_HANDLE handle,
+	    ACE_Message_Block &message_block,
+	    u_long bytes_to_read,
+	    const void* act,
+	    ACE_HANDLE event);
     // Constructor is protected since creation is limited to
     // ACE_Asynch_Read_Stream factory.
 
     virtual void complete (u_long bytes_transferred,
-                           int success,
-                           const void *completion_key,
-                           u_long error = 0);
+			   int success,
+			   const void *completion_key,
+			   u_long error = 0);
     // ACE_Proactor will call this method when the read completes.
 
   protected:
@@ -273,8 +273,8 @@ public:
   // A do nothing constructor.
 
   int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             const void *act = 0);
+	     u_long bytes_to_write,
+	     const void *act = 0);
   // This starts off an asynchronous write.  Upto <bytes_to_write>
   // will be written from the <message_block>.
 
@@ -313,18 +313,18 @@ public:
     // These two should really be protected.  But sometimes it
     // simplifies code to be able to "fake" a result.  Use carefully.
     Result (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            ACE_Message_Block &message_block,
-            u_long bytes_to_write,
-            const void* act,
-            ACE_HANDLE event);
+	    ACE_HANDLE handle,
+	    ACE_Message_Block &message_block,
+	    u_long bytes_to_write,
+	    const void* act,
+	    ACE_HANDLE event);
     // Constructor is protected since creation is limited to
     // ACE_Asynch_Write_Stream factory.
 
     virtual void complete (u_long bytes_transferred,
-                           int success,
-                           const void *completion_key,
-                           u_long error = 0);
+			   int success,
+			   const void *completion_key,
+			   u_long error = 0);
     // ACE_Proactor will call this method when the write completes.
 
   protected:
@@ -357,10 +357,10 @@ class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream
   //     allows the user to specify an offset for the read.
 public:
   int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            u_long offset = 0,
-            u_long offset_high = 0,
-            const void *act = 0);
+	    u_long bytes_to_read,
+	    u_long offset = 0,
+	    u_long offset_high = 0,
+	    const void *act = 0);
   // This starts off an asynchronous read.  Upto <bytes_to_read> will
   // be read and stored in the <message_block>.  The read will start
   // at <offset> from the beginning of the file.
@@ -392,20 +392,20 @@ public:
     // These two should really be protected.  But sometimes it
     // simplifies code to be able to "fake" a result.  Use carefully.
     Result (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void* act,
-            u_long offset,
-            u_long offset_high,
-            ACE_HANDLE event);
+	    ACE_HANDLE handle,
+	    ACE_Message_Block &message_block,
+	    u_long bytes_to_read,
+	    const void* act,
+	    u_long offset,
+	    u_long offset_high,
+	    ACE_HANDLE event);
     // Constructor is protected since creation is limited to
     // ACE_Asynch_Read_File factory.
 
     virtual void complete (u_long bytes_transferred,
-                           int success,
-                           const void *completion_key,
-                           u_long error = 0);
+			   int success,
+			   const void *completion_key,
+			   u_long error = 0);
     // ACE_Proactor will call this method when the read completes.
   };
 };
@@ -427,10 +427,10 @@ public:
   //     This class differs slightly from ACE_Asynch_Write_Stream as
   //     it allows the user to specify an offset for the write.
   int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             u_long offset = 0,
-             u_long offset_high = 0,
-             const void *act = 0);
+	     u_long bytes_to_write,
+	     u_long offset = 0,
+	     u_long offset_high = 0,
+	     const void *act = 0);
   // This starts off an asynchronous write.  Upto <bytes_to_write>
   // will be write and stored in the <message_block>.  The write will
   // start at <offset> from the beginning of the file.
@@ -462,20 +462,20 @@ public:
     // These two should really be protected.  But sometimes it
     // simplifies code to be able to "fake" a result.  Use carefully.
     Result (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            ACE_Message_Block &message_block,
-            u_long bytes_to_write,
-            const void* act,
-            u_long offset,
-            u_long offset_high,
-            ACE_HANDLE event);
+	    ACE_HANDLE handle,
+	    ACE_Message_Block &message_block,
+	    u_long bytes_to_write,
+	    const void* act,
+	    u_long offset,
+	    u_long offset_high,
+	    ACE_HANDLE event);
     // Constructor is protected since creation is limited to
     // ACE_Asynch_Write_File factory.
 
     virtual void complete (u_long bytes_transferred,
-                           int success,
-                           const void *completion_key,
-                           u_long error = 0);
+			   int success,
+			   const void *completion_key,
+			   u_long error = 0);
     // ACE_Proactor will call this method when the write completes.
   };
 };
@@ -497,9 +497,9 @@ public:
   // A do nothing constructor.
 
   int accept (ACE_Message_Block &message_block,
-              u_long bytes_to_read,
-              ACE_HANDLE accept_handle = ACE_INVALID_HANDLE,
-              const void *act = 0);
+	      u_long bytes_to_read,
+	      ACE_HANDLE accept_handle = ACE_INVALID_HANDLE,
+	      const void *act = 0);
   // This starts off an asynchronous accept.  The asynchronous accept
   // call also allows any initial data to be returned to the
   // <handler>.  Upto <bytes_to_read> will be read and stored in the
@@ -543,19 +543,19 @@ public:
     // These two should really be protected.  But sometimes it
     // simplifies code to be able to "fake" a result.  Use carefully.
     Result (ACE_Handler &handler,
-            ACE_HANDLE listen_handle,
-            ACE_HANDLE accept_handle,
-            ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void* act,
-            ACE_HANDLE event);
+	    ACE_HANDLE listen_handle,
+	    ACE_HANDLE accept_handle,
+	    ACE_Message_Block &message_block,
+	    u_long bytes_to_read,
+	    const void* act,
+	    ACE_HANDLE event);
     // Constructor is protected since creation is limited to
     // ACE_Asynch_Accept factory.
 
     virtual void complete (u_long bytes_transferred,
-                           int success,
-                           const void *completion_key,
-                           u_long error = 0);
+			   int success,
+			   const void *completion_key,
+			   u_long error = 0);
     // ACE_Proactor will call this method when the accept completes.
 
   protected:
@@ -600,13 +600,13 @@ public:
   // A "do-nothing" constructor.
 
   int transmit_file (ACE_HANDLE file,
-                     Header_And_Trailer *header_and_trailer = 0,
-                     u_long bytes_to_write = 0,
-                     u_long offset = 0,
-                     u_long offset_high = 0,
-                     u_long bytes_per_send = 0,
-                     u_long flags = 0,
-                     const void *act = 0);
+		     Header_And_Trailer *header_and_trailer = 0,
+		     u_long bytes_to_write = 0,
+		     u_long offset = 0,
+		     u_long offset_high = 0,
+		     u_long bytes_per_send = 0,
+		     u_long flags = 0,
+		     const void *act = 0);
   // This starts off an asynchronous transmit file.  The <file> is a
   // handle to an open file.  <header_and_trailer> is a pointer to a
   // data structure that contains pointers to data to send before and
@@ -657,23 +657,23 @@ public:
     // These two should really be protected.  But sometimes it
     // simplifies code to be able to "fake" a result.  Use carefully.
     Result (ACE_Handler &handler,
-            ACE_HANDLE socket,
-            ACE_HANDLE file,
-            Header_And_Trailer *header_and_trailer,
-            u_long bytes_to_write,
-            u_long offset,
-            u_long offset_high,
-            u_long bytes_per_send,
-            u_long flags,
-            const void *act,
-            ACE_HANDLE event);
+	    ACE_HANDLE socket,
+	    ACE_HANDLE file,
+	    Header_And_Trailer *header_and_trailer,
+	    u_long bytes_to_write,
+	    u_long offset,
+	    u_long offset_high,
+	    u_long bytes_per_send,
+	    u_long flags,
+	    const void *act,
+	    ACE_HANDLE event);
     // Constructor is protected since creation is limited to
     // ACE_Asynch_Transmit_File factory.
 
     virtual void complete (u_long bytes_transferred,
-                           int success,
-                           const void *completion_key,
-                           u_long error = 0);
+			   int success,
+			   const void *completion_key,
+			   u_long error = 0);
     // ACE_Proactor will call this method when the write completes.
 
   protected:
@@ -709,15 +709,15 @@ public:
     //     and provided a consistent use of ACE_Message_Blocks.
   public:
     Header_And_Trailer (ACE_Message_Block *header = 0,
-                        u_long header_bytes = 0,
-                        ACE_Message_Block *trailer = 0,
-                        u_long trailer_bytes = 0);
+			u_long header_bytes = 0,
+			ACE_Message_Block *trailer = 0,
+			u_long trailer_bytes = 0);
     // Constructor
 
     void header_and_trailer (ACE_Message_Block *header = 0,
-                             u_long header_bytes = 0,
-                             ACE_Message_Block *trailer = 0,
-                             u_long trailer_bytes = 0);
+			     u_long header_bytes = 0,
+			     ACE_Message_Block *trailer = 0,
+			     u_long trailer_bytes = 0);
     // This method allows all the member to be set in one fell swoop.
 
     ACE_Message_Block *header (void) const;
@@ -799,7 +799,7 @@ public:
   // completes.
 
   virtual void handle_time_out (const ACE_Time_Value &tv,
-                                const void *act = 0);
+				const void *act = 0);
   // Called when timer expires.  <tv> was the requested time value and
   // <act> is the ACT passed when scheduling the timer
 
@@ -855,7 +855,7 @@ public:
   // friend has been figured out.
 
   virtual void addresses (const ACE_INET_Addr &remote_address,
-                          const ACE_INET_Addr &local_address);
+			  const ACE_INET_Addr &local_address);
   // Called by ACE_Asynch_Acceptor to pass the addresses of the new
   // connections.
 };
diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp
index 6f1b8abce17..af4ec679b84 100644
--- a/ace/Hash_Map_Manager.cpp
+++ b/ace/Hash_Map_Manager.cpp
@@ -162,7 +162,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i (void)
           ACE_Hash_Map_Entry<EXT_ID, INT_ID> *entry = &table_[i];
           // The "if" second argument results in a no-op instead of
           // deallocation.
-          ACE_DES_FREE_TEMPLATE2 (entry, if,
+          ACE_DES_FREE_TEMPLATE2 (entry, ACE_NOOP,
                                   ACE_Hash_Map_Entry, EXT_ID, INT_ID);
         }
 
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 4d6d8fbe81d..afff8480439 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -177,7 +177,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::free_search_structure (void)
           ACE_Map_Entry<EXT_ID, INT_ID> *ss = &this->search_structure_[i];
           // The "if" second argument results in a no-op instead of
           // deallocation.
-          ACE_DES_FREE_TEMPLATE2 (ss, if,
+          ACE_DES_FREE_TEMPLATE2 (ss, ACE_NOOP,
                                   ACE_Map_Entry, EXT_ID, INT_ID);
         }
 
diff --git a/ace/OS.h b/ace/OS.h
index 277f3e41dfe..ddce179bd25 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -5414,6 +5414,7 @@ private:
      else { new (POINTER) CONSTRUCTOR; } \
    } while (0)
 
+# define ACE_NOOP(x)
 # define ACE_DES_NOFREE (POINTER,CLASS) POINTER->CLASS::~CLASS ()
 # define ACE_DES_FREE(POINTER,DEALLOCATOR,CLASS) \
    do { POINTER->CLASS::~CLASS (); DEALLOCATOR (POINTER); } while (0)
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 407979f65d6..d9942bdd856 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -12,6 +12,7 @@
 // Static definitions.
 
 #if defined (ACE_HAS_SIG_C_FUNC)
+
 extern "C" void
 ace_sig_handler_dispatch (int signum, siginfo_t *info, ucontext_t *context)
 {
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]
author	gonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	1998-06-22 07:08:40 +0000
committer	gonzo <gonzo@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	1998-06-22 07:08:40 +0000
commit	2d7a7c9bdd96fda2e35f9501ce7224bf3cb17061 (patch)
tree	71bfe3efd351cc35a86f954ef8639eedf353c6d0
parent	72709a5ed28debaa1358b3dac81c9925f5d5d9fe (diff)
download	ATCD-2d7a7c9bdd96fda2e35f9501ce7224bf3cb17061.tar.gz