diff --git a/harbour/samples/hscript/bld32exe.bat b/harbour/samples/hscript/bld32exe.bat
index c6a029d79e..df4dcb49be 100644
--- a/harbour/samples/hscript/bld32exe.bat
+++ b/harbour/samples/hscript/bld32exe.bat
@@ -3,17 +3,17 @@
 IF A%1 == A GOTO :SINTAX
 IF A%2 == A GOTO :NOOUTPUT
 
-echo -O2 -e%2.exe -I..\..\..\include ..\..\..\source\vm\hvm.c %1.c > b32.bc
-echo ..\..\..\libs\b32\harbour.lib  ..\..\..\libs\b32\terminal.lib >> b32.bc
-echo ..\..\..\libs\b32\hbgt.lib >> b32.bc
+echo -O2 -e%2.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b32.bc
+echo ..\..\libs\b32\harbour.lib ..\..\libs\b32\terminal.lib >> b32.bc
+echo ..\..\libs\b32\hbgt.lib >> b32.bc
 bcc32 @b32.bc
 del b32.bc
 GOTO :END
 
 :NOOUTPUT
-echo -O2 -e%1.exe -I..\..\..\include ..\..\..\source\vm\hvm.c %1.c > b32.bc
-echo ..\..\..\libs\b32\harbour.lib  ..\..\..\libs\b32\terminal.lib >> b32.bc
-echo ..\..\..\libs\b32\hbgt.lib >> b32.bc
+echo -O2 -e%1.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b32.bc
+echo ..\..\libs\b32\harbour.lib ..\..\libs\b32\terminal.lib >> b32.bc
+echo ..\..\libs\b32\hbgt.lib >> b32.bc
 echo ..\runner.obj >> b32.bc
 bcc32 @b32.bc
 del b32.bc
diff --git a/harbour/samples/hscript/bldguest.bat b/harbour/samples/hscript/bldguest.bat
index cd0e25234c..cdc40f22b6 100644
--- a/harbour/samples/hscript/bldguest.bat
+++ b/harbour/samples/hscript/bldguest.bat
@@ -1,14 +1,14 @@
 @echo off
 
-..\..\..\bin\harbour guestbk /n
-..\..\..\bin\harbour ..\inifiles
-..\..\..\bin\harbour ..\testcgi
+..\..\bin\harbour guestbk /n
+..\..\bin\harbour ..\inifiles
+..\..\bin\harbour ..\testcgi
 
-echo -O2 -eguestbk.exe -I..\..\..\include ..\..\..\source\vm\hvm.c guestbk.c > b32.bc
+echo -O2 -eguestbk.exe -I..\..\include ..\..\source\vm\hvm.c guestbk.c > b32.bc
 echo inifiles.c testcgi.c                                        >> b32.bc
-echo ..\..\..\libs\b32\harbour.lib  ..\..\..\libs\b32\terminal.lib >> b32.bc
-echo ..\..\..\libs\b32\hbgt.lib ..\..\..\libs\b32\hbpp.lib >> b32.bc
-echo ..\..\..\libs\b32\rdd.lib >> b32.bc
+echo ..\..\libs\b32\harbour.lib  ..\..\libs\b32\terminal.lib >> b32.bc
+echo ..\..\libs\b32\hbgt.lib ..\..\libs\b32\hbpp.lib >> b32.bc
+echo ..\..\libs\b32\rdd.lib >> b32.bc
 bcc32 @b32.bc
 del b32.bc
 
diff --git a/harbour/samples/hscript/hb32.bat b/harbour/samples/hscript/hb32.bat
index 865cd15c70..ec1d5ea826 100644
--- a/harbour/samples/hscript/hb32.bat
+++ b/harbour/samples/hscript/hb32.bat
@@ -1,7 +1,7 @@
 @echo off
 
 REM From .PRG to .C = Harbour
-..\..\..\bin\harbour %1.prg /n /i..\..\..\include
+..\..\bin\harbour %1.prg /n /i..\..\include
 if errorlevel 1 goto end
 
 REM From .C to .EXE = BuildExe
diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile
index a93cc963a4..937bc7a95d 100644
--- a/harbour/tests/Makefile
+++ b/harbour/tests/Makefile
@@ -2,7 +2,7 @@
 # $Id$
 #
 
-ROOT = ../../
+ROOT = ../
 
 LIBS=\
 	tools \
diff --git a/harbour/tests/bld32exe.bat b/harbour/tests/bld32exe.bat
index 5dbb0af1ef..809b1f144e 100644
--- a/harbour/tests/bld32exe.bat
+++ b/harbour/tests/bld32exe.bat
@@ -6,19 +6,19 @@ rem
 IF A%1 == A GOTO :SINTAX
 IF A%2 == A GOTO :NOOUTPUT
 
-echo -O2 -e%2.exe -I..\..\include %1.c > b32.bc
-echo ..\..\lib\b32\harbour.lib  ..\..\lib\b32\terminal.lib >> b32.bc
-echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
-echo ..\..\lib\b32\rdd.lib >> b32.bc
+echo -O2 -e%2.exe -I..\include %1.c > b32.bc
+echo ..\lib\b32\harbour.lib ..\lib\b32\terminal.lib >> b32.bc
+echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc
+echo ..\lib\b32\rdd.lib >> b32.bc
 bcc32 -v @b32.bc
 del b32.bc
 GOTO :END
 
 :NOOUTPUT
-echo -O2 -e%1.exe -I..\..\include %1.c > b32.bc
-echo ..\..\lib\b32\harbour.lib  ..\..\lib\b32\terminal.lib >> b32.bc
-echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
-echo ..\..\lib\b32\rdd.lib >> b32.bc
+echo -O2 -e%1.exe -I..\include %1.c > b32.bc
+echo ..\lib\b32\harbour.lib  ..\lib\b32\terminal.lib >> b32.bc
+echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc
+echo ..\lib\b32\rdd.lib >> b32.bc
 bcc32 -v @b32.bc
 del b32.bc
 GOTO :END
diff --git a/harbour/tests/bld32obj.bat b/harbour/tests/bld32obj.bat
index 9fa151b01c..2017f73ca0 100644
--- a/harbour/tests/bld32obj.bat
+++ b/harbour/tests/bld32obj.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-..\..\bin\harbour %1 /fobj32 /n /i..\..\include
-tlink32 -L..\..\lib\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib import32.lib cw32mt.lib
+..\bin\harbour %1 /fobj32 /n /i..\include
+tlink32 -L..\lib\b32;c:\bc5\lib c:\bc5\lib\c0x32.obj %1.obj hvm.obj,%1.exe,, harbour.lib terminal.lib import32.lib cw32mt.lib
 
diff --git a/harbour/tests/bld32w.bat b/harbour/tests/bld32w.bat
index 81fc5c4a92..5b4e67adfb 100644
--- a/harbour/tests/bld32w.bat
+++ b/harbour/tests/bld32w.bat
@@ -6,19 +6,19 @@ rem
 IF A%1 == A GOTO :SINTAX
 IF A%2 == A GOTO :NOOUTPUT
 
-echo -O2 -e%2.exe -DWINDOWS -tW -I..\..\include > b32.bc
-echo ..\..\source\vm\hvm.c %1.c ..\..\lib\b32\harbour.lib  ..\..\lib\b32\termwin.lib >> b32.bc
-echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
-echo ..\..\lib\b32\rdd.lib >> b32.bc
+echo -O2 -e%2.exe -DWINDOWS -tW -I..\include > b32.bc
+echo ..\source\vm\hvm.c %1.c ..\lib\b32\harbour.lib  ..\lib\b32\termwin.lib >> b32.bc
+echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc
+echo ..\lib\b32\rdd.lib >> b32.bc
 bcc32 @b32.bc
 del b32.bc
 GOTO :END
 
 :NOOUTPUT
-echo -O2 -e%1.exe -DWINDOWS -tW -I..\..\include > b32.bc
-echo ..\..\source\vm\hvm.c %1.c ..\..\lib\b32\harbour.lib  ..\..\lib\b32\termwin.lib >> b32.bc
-echo ..\..\lib\b32\hbgt.lib ..\..\lib\b32\hbpp.lib >> b32.bc
-echo ..\..\lib\b32\rdd.lib >> b32.bc
+echo -O2 -e%1.exe -DWINDOWS -tW -I..\include > b32.bc
+echo ..\source\vm\hvm.c %1.c ..\lib\b32\harbour.lib  ..\lib\b32\termwin.lib >> b32.bc
+echo ..\lib\b32\hbgt.lib ..\lib\b32\hbpp.lib >> b32.bc
+echo ..\lib\b32\rdd.lib >> b32.bc
 bcc32 @b32.bc
 del b32.bc
 GOTO :END
diff --git a/harbour/tests/bldpexe.bat b/harbour/tests/bldpexe.bat
index 5eb1a2f1a5..47f166f5dd 100644
--- a/harbour/tests/bldpexe.bat
+++ b/harbour/tests/bldpexe.bat
@@ -6,15 +6,15 @@ rem
 IF A%1 == A GOTO :SINTAX
 IF A%2 == A GOTO :NOOUTPUT
 
-echo -P -mh -O2 -Fm -e%2.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
-echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
+echo -P -mh -O2 -Fm -e%2.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc
+echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc
 bcc @b16.bc
 del b16.bc
 GOTO :END
 
 :NOOUTPUT
-echo -P -mh -O2 -Fm -e%1.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
-echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
+echo -P -mh -O2 -Fm -e%1.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc
+echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc
 bcc @b16.bc
 del b16.bc
 GOTO :END
diff --git a/harbour/tests/buildexe.bat b/harbour/tests/buildexe.bat
index 67e49cfa08..e09cd809e2 100644
--- a/harbour/tests/buildexe.bat
+++ b/harbour/tests/buildexe.bat
@@ -6,15 +6,15 @@ rem
 IF A%1 == A GOTO :SINTAX
 IF A%2 == A GOTO :NOOUTPUT
 
-echo -mh -O2 -Fm -e%2.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
-echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
+echo -mh -O2 -Fm -e%2.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc
+echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc
 bcc @b16.bc
 del b16.bc
 GOTO :END
 
 :NOOUTPUT
-echo -mh -O2 -Fm -e%1.exe -I..\..\include ..\..\source\vm\hvm.c %1.c > b16.bc
-echo ..\..\lib\b16\harbour.lib ..\..\lib\b16\hbtools.lib ..\..\lib\b16\terminal.lib >> b16.bc
+echo -mh -O2 -Fm -e%1.exe -I..\include ..\source\vm\hvm.c %1.c > b16.bc
+echo ..\lib\b16\harbour.lib ..\lib\b16\hbtools.lib ..\lib\b16\terminal.lib >> b16.bc
 bcc @b16.bc
 del b16.bc
 GOTO :END
diff --git a/harbour/tests/buildvc.bat b/harbour/tests/buildvc.bat
index f552e64c8f..201ea23d75 100644
--- a/harbour/tests/buildvc.bat
+++ b/harbour/tests/buildvc.bat
@@ -3,5 +3,5 @@ rem
 rem $Id$
 rem
 
-..\..\bin\harbour %1 /n /i..\..\include
-cl -Fd..\..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\..\include %1.c /link /subsystem:CONSOLE ..\..\lib\vc\harbour.lib ..\..\lib\vc\terminal.lib ..\..\lib\vc\hbtools.lib ..\..\lib\vc\dbfntx.lib ..\..\lib\vc\debug.lib
+..\bin\harbour %1 /n /i..\include
+cl -Fd..\bin\harbour -w -Zi -TP -GZ -GA -DDEBUG -DHARBOUR_USE_WIN_GTAPI -I..\include %1.c /link /subsystem:CONSOLE ..\lib\vc\harbour.lib ..\lib\vc\terminal.lib ..\lib\vc\hbtools.lib ..\lib\vc\dbfntx.lib ..\lib\vc\debug.lib
diff --git a/harbour/tests/hb.bat b/harbour/tests/hb.bat
index 0f7674a9cd..6423a38b4c 100644
--- a/harbour/tests/hb.bat
+++ b/harbour/tests/hb.bat
@@ -4,7 +4,7 @@ rem $Id$
 rem 
 
 REM From .PRG to .C = Harbour
-..\..\bin\harbour %1 /n /i..\..\include
+..\bin\harbour %1 /n /i..\include
 if errorlevel 1 goto end
 
 REM From .C to .EXE = BuildExe
diff --git a/harbour/tests/hb32.bat b/harbour/tests/hb32.bat
index b5f1d2f7ee..dae9889209 100644
--- a/harbour/tests/hb32.bat
+++ b/harbour/tests/hb32.bat
@@ -4,7 +4,7 @@ rem $Id$
 rem 
 
 REM From .PRG to .C = Harbour
-..\..\bin\harbour %1 %2 /n /i..\..\include
+..\bin\harbour %1 %2 /n /i..\include
 if errorlevel 1 goto end
 
 REM From .C to .EXE = BuildExe
diff --git a/harbour/tests/hb32w.bat b/harbour/tests/hb32w.bat
index c84ec968f4..bb52c23977 100644
--- a/harbour/tests/hb32w.bat
+++ b/harbour/tests/hb32w.bat
@@ -4,7 +4,7 @@ rem $Id$
 rem 
 
 REM From .PRG to .C = Harbour
-..\..\bin\harbour %1 /n /i..\..\include
+..\bin\harbour %1 /n /i..\include
 if errorlevel 1 goto end
 
 REM From .C to .EXE = BuildExe
diff --git a/harbour/tests/hbp.bat b/harbour/tests/hbp.bat
index d52cf90db0..1be712f198 100644
--- a/harbour/tests/hbp.bat
+++ b/harbour/tests/hbp.bat
@@ -4,7 +4,7 @@ rem $Id$
 rem 
 
 REM From .PRG to .C = Harbour
-..\..\bin\harbour %1 /n /i..\..\include
+..\bin\harbour %1 /n /i..\include
 if errorlevel 1 goto end
 
 REM From .C to .EXE = Bld+Exe
diff --git a/harbour/tests/hbrunprg.bat b/harbour/tests/hbrunprg.bat
index 45295de1d0..fb52bc77b6 100644
--- a/harbour/tests/hbrunprg.bat
+++ b/harbour/tests/hbrunprg.bat
@@ -4,5 +4,5 @@ rem $Id$
 rem 
 
 REM From .PRG to .C = Harbour
-..\..\bin\harbour %1 /n /gHRB /i..\..\include
+..\bin\harbour %1 /n /gHRB /i..\include
 hbrun %1
diff --git a/harbour/tests/hbvc.bat b/harbour/tests/hbvc.bat
index 24670ef209..8801297284 100644
--- a/harbour/tests/hbvc.bat
+++ b/harbour/tests/hbvc.bat
@@ -4,7 +4,7 @@ rem $Id$
 rem 
 
 REM From .PRG to .C = Harbour
-..\..\bin\harbour %1 /n /i..\..\include
+..\bin\harbour %1 /n /i..\include
 
 REM From .C to .EXE = BuildExe
 call BLDVCEXE %1 %2
diff --git a/harbour/tests/run_all.bat b/harbour/tests/run_all.bat
index ecf090bd51..00a5fba071 100644
--- a/harbour/tests/run_all.bat
+++ b/harbour/tests/run_all.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem 
 
-..\..\bin\harbour test_all.prg /n /gHBR /i..\..\include
+..\bin\harbour test_all.prg /n /gHBR /i..\include
 hbrun test_all
 call testall.bat
diff --git a/harbour/tests/test_all.prg b/harbour/tests/test_all.prg
index a8fa572807..ef3c9017a6 100644
--- a/harbour/tests/test_all.prg
+++ b/harbour/tests/test_all.prg
@@ -37,7 +37,7 @@ LOCAL aDir,f,n,o,p,cRead
             fWrite(o,":" + n + Chr(13) + Chr(10))
             IF !Empty( cOption ) .and. Upper( cOption ) == "HRB"
                fWrite(o,;
-                  "..\..\bin\harbour "+aDir[f][1]+" /n /gHRB /i..\..\include >> test_all.out"+Chr(13)+Chr(10)+;
+                  "..\bin\harbour "+aDir[f][1]+" /n /gHRB /i..\include >> test_all.out"+Chr(13)+Chr(10)+;
                   "if errorlevel 1 goto end"+Chr(13)+Chr(10)+;
                   "hbrun "+Left(aDir[f][1],Len(aDir[f][1])-4)+".hrb >> test_all.out"+Chr(13)+Chr(10) )
             ELSE