diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 538c5693d3..7ecb96cad2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,76 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-29 22:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * make_vcce.bat
+   * make_vcce.mak
+   * make_b32.bat
+   * make_b32.mak
+   * make_vc.bat
+   * make_vc.mak
+   * common.mak
+     + Now every internally used envvars are reset before 
+       exiting.
+     ! Not tampering with user level envvars by changing 
+       their content to default values.
+     % HB_GT_* envvar defaulting move to .mak file level, 
+       since these envvars were not used on batch file 
+       level anyway.
+
+   * make_vcce.bat
+   * make_vcce.mak
+     * CFLAGS -DHB_NO_WIN_CONSOLE moved to the make file.
+       If there was any reason to have this only CE C flag 
+       in batch file separated from the rest of the extra 
+       CE C flags in the make file, please speak up.
+       This change may cause trouble for those using 
+       the make file directly and at the same time don't 
+       want to use the HB_NO_WIN_CONSOLE compiler flag. 
+       In this case we should add a documented way to 
+       disable it inside the make file IMO.
+
+   * contrib/freeimage/make_b32.bat
+   * contrib/freeimage/make_vc.bat
+   * contrib/apollo/make_b32.bat
+   * contrib/apollo/make_vc.bat
+   * contrib/firebird/make_b32.bat
+   * contrib/firebird/make_vc.bat
+   * contrib/pdflib/make_b32.bat
+   * contrib/pdflib/make_vc.bat
+   * contrib/hbzlib/make_b32.bat
+   * contrib/hbzlib/make_vc.bat
+   * contrib/pgsql/make_b32.bat
+   * contrib/pgsql/make_vc.bat
+   * contrib/gd/make_b32.bat
+   * contrib/gd/make_vc.bat
+   * contrib/rdd_ads/make_b32.bat
+   * contrib/rdd_ads/make_vc.bat
+   * contrib/mysql/make_b32.bat
+   * contrib/mysql/make_vc.bat
+   * contrib/odbc/make_b32.bat
+   * contrib/odbc/make_vc.bat
+   * contrib/what32/make_b32.bat
+   * contrib/what32/make_vc.bat
+   * contrib/msql/make_b32.bat
+   * contrib/msql/make_vc.bat
+     + Now every internally used envvars are reset before 
+       exiting the batch file, so they won't interact 
+       with other batch files even if being called after 
+       each other using "call". So "%COMPSPEC% /c" is not 
+       necessary anymore when calling these batches.
+     ! Fixed to use _HB_CC_NAME when dealing with .dll to .lib 
+       conversions.
+
+   * contrib/make_b32_all.bat
+   * contrib/make_vc_all.bat
+     + Added gtwvg library.
+     + Added what32 library (to DO_NOT_COMPILE list for b32).
+
+   * contrib/mtpl_b32.bat
+   * contrib/mtpl_vc.bat
+     ! Undone prev change because it interacted with .dll to .lib
+       conversions.
+
 2007-11-29 22:10 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
   * harbour/make_b32.bat
   * harbour/make_vc.bat
diff --git a/harbour/common.mak b/harbour/common.mak
index 1819c3d3de..a7070e5047 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -86,6 +86,10 @@ HB_LIB_INSTALL = $(HB_INSTALL_PREFIX)\lib
 # Directory macros. These should never have to change.
 #**********************************************************
 
+!ifdef _HB_CC_NAME
+HB_CC_NAME = $(_HB_CC_NAME)
+!endif
+
 BIN_DIR = bin\$(HB_CC_NAME)
 OBJ_DIR = obj\$(HB_CC_NAME)
 LIB_DIR = lib\$(HB_CC_NAME)
diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/apollo/make_b32.bat
index 030a93caa3..9956f4af6d 100644
--- a/harbour/contrib/apollo/make_b32.bat
+++ b/harbour/contrib/apollo/make_b32.bat
@@ -38,20 +38,24 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/apollo/make_vc.bat
index d3046319c4..c953eabd00 100644
--- a/harbour/contrib/apollo/make_vc.bat
+++ b/harbour/contrib/apollo/make_vc.bat
@@ -50,7 +50,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -59,15 +59,19 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/firebird/make_b32.bat b/harbour/contrib/firebird/make_b32.bat
index 5475298848..803358d938 100644
--- a/harbour/contrib/firebird/make_b32.bat
+++ b/harbour/contrib/firebird/make_b32.bat
@@ -38,20 +38,24 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/firebird/make_vc.bat b/harbour/contrib/firebird/make_vc.bat
index 231d53a2d0..e4dfa2b8f2 100644
--- a/harbour/contrib/firebird/make_vc.bat
+++ b/harbour/contrib/firebird/make_vc.bat
@@ -50,7 +50,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -59,15 +59,19 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/freeimage/make_b32.bat b/harbour/contrib/freeimage/make_b32.bat
index 894398f825..bfdd94ee80 100644
--- a/harbour/contrib/freeimage/make_b32.bat
+++ b/harbour/contrib/freeimage/make_b32.bat
@@ -39,20 +39,24 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/freeimage/make_vc.bat b/harbour/contrib/freeimage/make_vc.bat
index 05b5d249f7..0015d45f54 100644
--- a/harbour/contrib/freeimage/make_vc.bat
+++ b/harbour/contrib/freeimage/make_vc.bat
@@ -51,7 +51,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -60,15 +60,19 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/gd/make_b32.bat
index 4d8c7aa2af..62728969b7 100644
--- a/harbour/contrib/gd/make_b32.bat
+++ b/harbour/contrib/gd/make_b32.bat
@@ -38,20 +38,24 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/gd/make_vc.bat
index 532fe36d8f..d2ac7c9657 100644
--- a/harbour/contrib/gd/make_vc.bat
+++ b/harbour/contrib/gd/make_vc.bat
@@ -50,7 +50,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -59,15 +59,19 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat
index abda110a5c..bd12dc99a4 100644
--- a/harbour/contrib/hbzlib/make_b32.bat
+++ b/harbour/contrib/hbzlib/make_b32.bat
@@ -6,3 +6,5 @@ rem
 set CFLAGS=-Iinclude
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set CFLAGS=
diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat
index 39ebf110fd..11d92f9121 100644
--- a/harbour/contrib/hbzlib/make_vc.bat
+++ b/harbour/contrib/hbzlib/make_vc.bat
@@ -6,3 +6,5 @@ rem
 set CFLAGS=-Iinclude
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set CFLAGS=
diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat
index f6aec612ca..013295bf8e 100644
--- a/harbour/contrib/make_b32_all.bat
+++ b/harbour/contrib/make_b32_all.bat
@@ -8,9 +8,9 @@ rem IT or you will break Win9x command.com line length limit !!!
 
 set HB_SHOW_ERRORS=no
 
-set DO_NOT_COMPILE=examples hbclip hgf
+set DO_NOT_COMPILE=examples hbclip hgf what32
 
-set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf msql
+set DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql
 for %%n in ( %DIRS% ) do %COMSPEC% /c make_b32.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set DIRS=ole hbzlib htmllib odbc telepath tip win32 xhb
diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat
index 37f7a72eea..7559e01e09 100644
--- a/harbour/contrib/make_vc_all.bat
+++ b/harbour/contrib/make_vc_all.bat
@@ -10,10 +10,10 @@ set HB_SHOW_ERRORS=no
 
 set DO_NOT_COMPILE=examples hbclip hgf
 
-set DIRS=adordd bmdbfcdx btree libct libgt libmisc libnf msql
+set DIRS=adordd bmdbfcdx btree gtwvg libct libgt libmisc libnf msql
 for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
-set DIRS=ole hbzlib htmllib odbc telepath tip win32 xhb
+set DIRS=ole hbzlib htmllib odbc telepath tip what32 win32 xhb
 for %%n in ( %DIRS% ) do %COMSPEC% /c make_vc.bat %%n %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set DIRS=samples directx
diff --git a/harbour/contrib/msql/make_b32.bat b/harbour/contrib/msql/make_b32.bat
index 3c418ccf7d..94c5513f78 100644
--- a/harbour/contrib/msql/make_b32.bat
+++ b/harbour/contrib/msql/make_b32.bat
@@ -6,3 +6,5 @@ rem
 set CFLAGS=-D_OS_WIN32
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set CFLAGS=
diff --git a/harbour/contrib/msql/make_vc.bat b/harbour/contrib/msql/make_vc.bat
index ead8e70b68..6783fe5153 100644
--- a/harbour/contrib/msql/make_vc.bat
+++ b/harbour/contrib/msql/make_vc.bat
@@ -6,3 +6,5 @@ rem
 set CFLAGS=-D_OS_WIN32
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set CFLAGS=
diff --git a/harbour/contrib/mtpl_b32.bat b/harbour/contrib/mtpl_b32.bat
index e5174f42fa..bdfd42543f 100644
--- a/harbour/contrib/mtpl_b32.bat
+++ b/harbour/contrib/mtpl_b32.bat
@@ -57,7 +57,3 @@ if "%1" == "INSTALL" goto INSTALL
    goto EXIT
 
 :EXIT
-
-set _HB_CC_NAME=
-set _HB_MAKE_PROGRAM=
-set _HB_MAKEFILE=
diff --git a/harbour/contrib/mtpl_vc.bat b/harbour/contrib/mtpl_vc.bat
index 55887652a7..29df60be33 100644
--- a/harbour/contrib/mtpl_vc.bat
+++ b/harbour/contrib/mtpl_vc.bat
@@ -57,7 +57,3 @@ if "%1" == "INSTALL" goto INSTALL
    goto EXIT
 
 :EXIT
-
-set _HB_CC_NAME=
-set _HB_MAKE_PROGRAM=
-set _HB_MAKEFILE=
diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat
index fe25cc617a..59cd8e0c2e 100644
--- a/harbour/contrib/mysql/make_b32.bat
+++ b/harbour/contrib/mysql/make_b32.bat
@@ -38,20 +38,24 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat
index 5fa15c068d..7384873fc0 100644
--- a/harbour/contrib/mysql/make_vc.bat
+++ b/harbour/contrib/mysql/make_vc.bat
@@ -50,7 +50,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -59,15 +59,19 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/odbc/make_b32.bat b/harbour/contrib/odbc/make_b32.bat
index 358215396b..ca07761ae1 100644
--- a/harbour/contrib/odbc/make_b32.bat
+++ b/harbour/contrib/odbc/make_b32.bat
@@ -26,20 +26,23 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/odbc/make_vc.bat b/harbour/contrib/odbc/make_vc.bat
index 6f49147348..89a27acabc 100644
--- a/harbour/contrib/odbc/make_vc.bat
+++ b/harbour/contrib/odbc/make_vc.bat
@@ -38,7 +38,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -48,15 +48,18 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat
index 595dad257f..7a50061cf7 100644
--- a/harbour/contrib/pdflib/make_b32.bat
+++ b/harbour/contrib/pdflib/make_b32.bat
@@ -17,3 +17,5 @@ exit 1
 set CFLAGS=-I%PDFLIB_DIR%\src\pdflib
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set CFLAGS=
diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat
index a03307a77e..f9ac348f17 100644
--- a/harbour/contrib/pdflib/make_vc.bat
+++ b/harbour/contrib/pdflib/make_vc.bat
@@ -17,3 +17,5 @@ exit 1
 set CFLAGS=-I%PDFLIB_DIR%\src\pdflib
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set CFLAGS=
diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat
index 889969ea52..0ec67824a5 100644
--- a/harbour/contrib/pgsql/make_b32.bat
+++ b/harbour/contrib/pgsql/make_b32.bat
@@ -39,20 +39,24 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.exe
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.exe
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat
index b63cb4cb96..e620fd2101 100644
--- a/harbour/contrib/pgsql/make_vc.bat
+++ b/harbour/contrib/pgsql/make_vc.bat
@@ -51,7 +51,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.exe > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -60,15 +60,19 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat
index 2fd98b59f9..bf9e598bc9 100644
--- a/harbour/contrib/rdd_ads/make_b32.bat
+++ b/harbour/contrib/rdd_ads/make_b32.bat
@@ -45,20 +45,24 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_BUILD
 
-   implib ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
+   implib ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %HB_DLL_DIR%\%HB_DLL_NAME%.dll
    goto POST_EXIT
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat
index 508028d07c..dd0381a100 100644
--- a/harbour/contrib/rdd_ads/make_vc.bat
+++ b/harbour/contrib/rdd_ads/make_vc.bat
@@ -57,7 +57,7 @@ if "%1" == "INSTALL" goto POST_INSTALL
    echo.LIBRARY %HB_DLL_DIR%\%HB_DLL_NAME%.dll > _temp.def
    echo.EXPORTS >> _temp.def
    sed -nf _temp.sed < _dump.tmp >> _temp.def
-   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib
+   LIB /MACHINE:X86 /DEF:_temp.def /OUT:..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib
    del _dump.tmp
    del _temp.def
    del _temp.sed
@@ -66,15 +66,19 @@ if "%1" == "INSTALL" goto POST_INSTALL
 
 :POST_CLEAN
 
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib > nul
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp del ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.exp > nul
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib      > nul
    goto POST_EXIT
 
 :POST_INSTALL
 
    if exist %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib del %_HB_LIB_INSTALL%\%HB_DLL_NAME%.lib
-   if exist ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
+   if exist ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib copy ..\..\lib\%_HB_CC_NAME%\%HB_DLL_NAME%.lib %_HB_LIB_INSTALL%
    goto POST_EXIT
 
 :POST_EXIT
+
+set CFLAGS=
+set HB_DLL_NAME=
+set HB_DLL_DIR=
diff --git a/harbour/contrib/what32/make_b32.bat b/harbour/contrib/what32/make_b32.bat
index 67aae59223..2eacd8b76d 100644
--- a/harbour/contrib/what32/make_b32.bat
+++ b/harbour/contrib/what32/make_b32.bat
@@ -6,3 +6,5 @@ rem
 set HARBOURFLAGS=-I..\xhb
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set HARBOURFLAGS=
diff --git a/harbour/contrib/what32/make_vc.bat b/harbour/contrib/what32/make_vc.bat
index ca98bf40bc..5accf5b3c8 100644
--- a/harbour/contrib/what32/make_vc.bat
+++ b/harbour/contrib/what32/make_vc.bat
@@ -6,3 +6,5 @@ rem
 set HARBOURFLAGS=-I..\xhb
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
+
+set HARBOURFLAGS=
diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat
index 92d0fcdb7d..ead6512b16 100644
--- a/harbour/make_b32.bat
+++ b/harbour/make_b32.bat
@@ -21,21 +21,13 @@ rem    set HB_SHOW_ERRORS=
 rem    set HB_MAKE_FLAGS=
 rem ---------------------------------------------------------------
 
-rem Save original environment variables
-if NOT "%HB_GT_LIB%"       == "" set HB_GT_LIB_SAV=%HB_GT_LIB%
-if NOT "%HB_CC_NAME%"      == "" set HB_CC_NAME_SAV=%HB_CC_NAME%
-if NOT "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM_SAV=%HB_MAKE_PROGRAM%
-if NOT "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS_SAV=%HB_SHOW_ERRORS%
+set _HB_CC_NAME=%HB_CC_NAME%
+set _HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM%
 
-rem Set environment variables to default values
-if "%HB_GT_LIB%"       == "" set HB_GT_LIB=gtwin
-if "%HB_CC_NAME%"      == "" set HB_CC_NAME=b32
-if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=make.exe
-if "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS=yes
+if "%_HB_CC_NAME%"      == "" set _HB_CC_NAME=b32
+if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=make.exe
 
-set HB_MAKEFILE=make_%HB_CC_NAME%.mak
-
-set HB_EXIT_LEVEL=
+set _HB_MAKEFILE=make_%_HB_CC_NAME%.mak
 
 rem ---------------------------------------------------------------
 
@@ -55,43 +47,33 @@ if "%1" == "INSTALL" goto INSTALL
 
 :BUILD
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
    if errorlevel 1 set HB_EXIT_LEVEL=1
-   if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log
+   if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log
    goto EXIT
 
 :CLEAN
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
    if errorlevel 1 set HB_EXIT_LEVEL=1
    if errorlevel 1 goto EXIT
-   if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
-   if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
+   if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul
+   if exist inst_%_HB_CC_NAME%.log del inst_%_HB_CC_NAME%.log > nul
    goto EXIT
 
 :INSTALL
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% INSTALL > nul
    if errorlevel 1 set HB_EXIT_LEVEL=1
    goto EXIT
 
-rem ---------------------------------------------------------------
-
 :EXIT
 
+rem ---------------------------------------------------------------
+
 rem Restore user value
 set COPYCMD=%HB_ORGENV_COPYCMD%
 
-set HB_MAKEFILE=
-
-set HB_GT_LIB=%HB_GT_LIB_SAV%
-set HB_CC_NAME=%HB_CC_NAME_SAV%
-set HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM_SAV%
-set HB_SHOW_ERRORS=%HB_SHOW_ERRORS_SAV%
-
-set HB_GT_LIB_SAV=
-set HB_CC_NAME_SAV=
-set HB_MAKE_PROGRAM_SAV=
-set HB_SHOW_ERRORS_SAV=
-
-if "%HB_EXIT_LEVEL%" == "1" exit 1
+set _HB_CC_NAME=
+set _HB_MAKE_PROGRAM=
+set _HB_MAKEFILE=
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index 71c9bd0390..94a0b228b7 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -58,6 +58,10 @@
 .AUTODEPEND
 .SUFFIXES:
 
+!if "$(HB_GT_LIB)" == ""
+HB_GT_LIB = gtwin
+!endif
+
 #**********************************************************
 
 CC     = bcc32.exe
diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat
index 62554c0234..be91bc701c 100644
--- a/harbour/make_vc.bat
+++ b/harbour/make_vc.bat
@@ -21,21 +21,13 @@ rem    set HB_SHOW_ERRORS=
 rem    set HB_MAKE_FLAGS=
 rem ---------------------------------------------------------------
 
-rem Save original environment variables
-if NOT "%HB_GT_LIB%"       == "" set HB_GT_LIB_SAV=%HB_GT_LIB%
-if NOT "%HB_CC_NAME%"      == "" set HB_CC_NAME_SAV=%HB_CC_NAME%
-if NOT "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM_SAV=%HB_MAKE_PROGRAM%
-if NOT "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS_SAV=%HB_SHOW_ERRORS%
+set _HB_CC_NAME=%HB_CC_NAME%
+set _HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM%
 
-rem Set environment variables to default values
-if "%HB_GT_LIB%"       == "" set HB_GT_LIB=gtwin
-if "%HB_CC_NAME%"      == "" set HB_CC_NAME=vc
-if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe
-if "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS=yes
+if "%_HB_CC_NAME%"      == "" set _HB_CC_NAME=vc
+if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=nmake.exe
 
-set HB_MAKEFILE=make_%HB_CC_NAME%.mak
-
-set HB_EXIT_LEVEL=
+set _HB_MAKEFILE=make_%_HB_CC_NAME%.mak
 
 rem ---------------------------------------------------------------
 
@@ -55,43 +47,33 @@ if "%1" == "INSTALL" goto INSTALL
 
 :BUILD
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
    if errorlevel 1 set HB_EXIT_LEVEL=1
-   if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log
+   if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log
    goto EXIT
 
 :CLEAN
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
    if errorlevel 1 set HB_EXIT_LEVEL=1
    if errorlevel 1 goto EXIT
-   if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
-   if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
+   if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul
+   if exist inst_%_HB_CC_NAME%.log del inst_%_HB_CC_NAME%.log > nul
    goto EXIT
 
 :INSTALL
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% INSTALL > nul
    if errorlevel 1 set HB_EXIT_LEVEL=1
    goto EXIT
 
-rem ---------------------------------------------------------------
-
 :EXIT
 
+rem ---------------------------------------------------------------
+
 rem Restore user value
 set COPYCMD=%HB_ORGENV_COPYCMD%
 
-set HB_MAKEFILE=
-
-set HB_GT_LIB=%HB_GT_LIB_SAV%
-set HB_CC_NAME=%HB_CC_NAME_SAV%
-set HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM_SAV%
-set HB_SHOW_ERRORS=%HB_SHOW_ERRORS_SAV%
-
-set HB_GT_LIB_SAV=
-set HB_CC_NAME_SAV=
-set HB_MAKE_PROGRAM_SAV=
-set HB_SHOW_ERRORS_SAV=
-
-if "%HB_EXIT_LEVEL%" == "1" exit 1
+set _HB_CC_NAME=
+set _HB_MAKE_PROGRAM=
+set _HB_MAKEFILE=
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 3572a9a946..0ca60101ea 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -56,6 +56,10 @@
 
 .SUFFIXES:
 
+!if "$(HB_GT_LIB)" == ""
+HB_GT_LIB = gtwin
+!endif
+
 #**********************************************************
 
 # Visual C++ version
diff --git a/harbour/make_vcce.bat b/harbour/make_vcce.bat
index aac6ab2979..5b0f4e5eb0 100644
--- a/harbour/make_vcce.bat
+++ b/harbour/make_vcce.bat
@@ -21,26 +21,13 @@ rem    set HB_MAKE_FLAGS=
 rem    set HB_CC_NAME=
 rem ---------------------------------------------------------------
 
-rem Save original environment variables
-if NOT "%HB_GT_LIB%"       == "" set HB_GT_LIB_SAV=%HB_GT_LIB%
-if NOT "%HB_CC_NAME%"      == "" set HB_CC_NAME_SAV=%HB_CC_NAME%
-if NOT "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM_SAV=%HB_MAKE_PROGRAM%
-if NOT "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS_SAV=%HB_SHOW_ERRORS%
-if NOT "%HB_GT_DEFAULT%"   == "" set HB_GT_DEFAULT_SAV=%HB_GT_DEFAULT%
-if NOT "%C_USR%"           == "" set C_USR_SAV=%C_USR%
+set _HB_CC_NAME=%HB_CC_NAME%
+set _HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM%
 
-rem Set environment variables to default values
-if "%HB_GT_LIB%"       == "" set HB_GT_LIB=gtwvt
-if "%HB_CC_NAME%"      == "" set HB_CC_NAME=vcce
-if "%HB_MAKE_PROGRAM%" == "" set HB_MAKE_PROGRAM=nmake.exe
-if "%HB_SHOW_ERRORS%"  == "" set HB_SHOW_ERRORS=yes
-if "%HB_GT_DEFAULT%"   == "" set HB_GT_DEFAULT=wvt
+if "%_HB_CC_NAME%"      == "" set _HB_CC_NAME=vcce
+if "%_HB_MAKE_PROGRAM%" == "" set _HB_MAKE_PROGRAM=nmake.exe
 
-set HB_MAKEFILE=make_%HB_CC_NAME%.mak
-
-set CFLAGS=%C_USR% -DHB_NO_WIN_CONSOLE
-
-set HB_EXIT_LEVEL=
+set _HB_MAKEFILE=make_%_HB_CC_NAME%.mak
 
 rem ---------------------------------------------------------------
 
@@ -60,47 +47,33 @@ if "%1" == "INSTALL" goto INSTALL
 
 :BUILD
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% %1 %2 %3 > make_%HB_CC_NAME%.log
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log
    if errorlevel 1 set HB_EXIT_LEVEL=1
-   if errorlevel 1 if "%HB_SHOW_ERRORS%" == "yes" notepad make_%HB_CC_NAME%.log
+   if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log
    goto EXIT
 
 :CLEAN
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% CLEAN > make_%HB_CC_NAME%.log
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log
    if errorlevel 1 set HB_EXIT_LEVEL=1
    if errorlevel 1 goto EXIT
-   if exist make_%HB_CC_NAME%.log del make_%HB_CC_NAME%.log > nul
-   if exist inst_%HB_CC_NAME%.log del inst_%HB_CC_NAME%.log > nul
+   if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul
+   if exist inst_%_HB_CC_NAME%.log del inst_%_HB_CC_NAME%.log > nul
    goto EXIT
 
 :INSTALL
 
-   %HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %HB_MAKEFILE% INSTALL > nul
+   %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% INSTALL > nul
    if errorlevel 1 set HB_EXIT_LEVEL=1
    goto EXIT
 
-rem ---------------------------------------------------------------
-
 :EXIT
 
+rem ---------------------------------------------------------------
+
 rem Restore user value
 set COPYCMD=%HB_ORGENV_COPYCMD%
 
-set HB_MAKEFILE=
-
-set HB_GT_LIB=%HB_GT_LIB_SAV%
-set HB_CC_NAME=%HB_CC_NAME_SAV%
-set HB_MAKE_PROGRAM=%HB_MAKE_PROGRAM_SAV%
-set HB_SHOW_ERRORS=%HB_SHOW_ERRORS_SAV%
-set HB_GT_DEFAULT=%HB_GT_DEFAULT_SAV%
-set C_USR=%C_USR_SAV%
-
-set HB_GT_LIB_SAV=
-set HB_CC_NAME_SAV=
-set HB_MAKE_PROGRAM_SAV=
-set HB_SHOW_ERRORS_SAV=
-set HB_GT_DEFAULT_SAV=
-set C_USR_SAV=
-
-if "%HB_EXIT_LEVEL%" == "1" exit 1
+set _HB_CC_NAME=
+set _HB_MAKE_PROGRAM=
+set _HB_MAKEFILE=
diff --git a/harbour/make_vcce.mak b/harbour/make_vcce.mak
index ae34ad0daa..0068c30ef9 100644
--- a/harbour/make_vcce.mak
+++ b/harbour/make_vcce.mak
@@ -54,6 +54,14 @@
 
 .SUFFIXES:
 
+!if "$(HB_GT_LIB)" == ""
+HB_GT_LIB = gtwvt
+!endif
+
+!if "$(HB_GT_DEFAULT)" == ""
+HB_GT_DEFAULT = wvt
+!endif
+
 #**********************************************************
 
 # Visual C++ version
@@ -117,7 +125,7 @@ CFLAGS         = -I$(INCLUDE_DIR) -I$(CFLAGS_VER) -T$(HB_BUILD_MODE) -W3 -nologo
                  -D"_WIN32_WCE=0x420" -D"UNDER_CE=0x420" -D"WIN32_PLATFORM_PSPC" \
                  -D"WINCE" -D"_WINCE" -D"_WINDOWS" -D"ARM" -D"_ARM_" -D"ARMV4" \
                  -D"POCKETPC2003_UI_MODEL" -D"_M_ARM" -D"UNICODE" -D"_UNICODE" \
-                 -DHB_WINCE $(C_USR) $(CFLAGS) -D_UWIN -I$(OBJ_DIR)
+                 -DHB_WINCE $(C_USR) $(CFLAGS) -D_UWIN -I$(OBJ_DIR) -DHB_NO_WIN_CONSOLE
 #     -D"_CONSOLE"
 
 !if "$(HB_BUILD_DEBUG)" == "yes"