diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index da8d48c029..b90a334199 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,10 +8,37 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-11-26 19:23 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * 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
+     ! Fixed CFLAGS assignments to not include %C_USR%, as this is 
+       done in the .mak files anyway.
+
+   * contrib/what32/make_b32.bat
+   * contrib/what32/make_vc.bat
+     + Added ..\xhb to the include path for Harbour.
+
 2007-11-26 18:50 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
   * harbour/contrib/mtpl_b32.mak
   * harbour/contrib/mtpl_vc.mak
     ! Fixed "hardcoded" definitions for OBJ_DIR, LIB_DIR, BIN_DIR
+    * Reset "echo" to "echo."
 
 2007-11-26 08:00 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com)
   + harbour/contrib/gtwvg/test
diff --git a/harbour/contrib/apollo/make_b32.bat b/harbour/contrib/apollo/make_b32.bat
index 1aeb59a7c6..030a93caa3 100644
--- a/harbour/contrib/apollo/make_b32.bat
+++ b/harbour/contrib/apollo/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%APOLLO_DIR%\include
+set CFLAGS=-I%APOLLO_DIR%\include
 set HB_DLL_NAME=sde61
 set HB_DLL_DIR=%APOLLO_DIR%
 
diff --git a/harbour/contrib/apollo/make_vc.bat b/harbour/contrib/apollo/make_vc.bat
index 28a078267f..d3046319c4 100644
--- a/harbour/contrib/apollo/make_vc.bat
+++ b/harbour/contrib/apollo/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%APOLLO_DIR%\include
+set CFLAGS=-I%APOLLO_DIR%\include
 set HB_DLL_NAME=sde61
 set HB_DLL_DIR=%APOLLO_DIR%
 
diff --git a/harbour/contrib/firebird/make_b32.bat b/harbour/contrib/firebird/make_b32.bat
index e5178a2ec1..abc93f83ae 100644
--- a/harbour/contrib/firebird/make_b32.bat
+++ b/harbour/contrib/firebird/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
 set HB_DLL_NAME=fbclient
 set HB_DLL_DIR=%FIREBIRD_DIR%\bin
 
diff --git a/harbour/contrib/firebird/make_vc.bat b/harbour/contrib/firebird/make_vc.bat
index 1f5c533c64..d454e10bcf 100644
--- a/harbour/contrib/firebird/make_vc.bat
+++ b/harbour/contrib/firebird/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FIREBIRD_DIR%\include -DHB_OS_WIN_32_USED
 set HB_DLL_NAME=fbclient
 set HB_DLL_DIR=%FIREBIRD_DIR%\bin
 
diff --git a/harbour/contrib/freeimage/make_b32.bat b/harbour/contrib/freeimage/make_b32.bat
index 4d10fb5a00..eea94ff9bb 100644
--- a/harbour/contrib/freeimage/make_b32.bat
+++ b/harbour/contrib/freeimage/make_b32.bat
@@ -15,7 +15,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
 set HB_DLL_NAME=FreeImage
 set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist
 
diff --git a/harbour/contrib/freeimage/make_vc.bat b/harbour/contrib/freeimage/make_vc.bat
index 582a2d37e6..f3d45c16b1 100644
--- a/harbour/contrib/freeimage/make_vc.bat
+++ b/harbour/contrib/freeimage/make_vc.bat
@@ -15,7 +15,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
+set CFLAGS=-I%FREEIMAGE_DIR%\source -DHB_OS_WIN_32_USED
 set HB_DLL_NAME=FreeImage
 set HB_DLL_DIR=%FREEIMAGE_DIR%\Dist
 
diff --git a/harbour/contrib/gd/make_b32.bat b/harbour/contrib/gd/make_b32.bat
index 690998e7a1..4d8c7aa2af 100644
--- a/harbour/contrib/gd/make_b32.bat
+++ b/harbour/contrib/gd/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%GD_DIR%\include
+set CFLAGS=-I%GD_DIR%\include
 set HB_DLL_NAME=bgd
 set HB_DLL_DIR=%GD_DIR%\bin
 
diff --git a/harbour/contrib/gd/make_vc.bat b/harbour/contrib/gd/make_vc.bat
index 986d1a0aa4..532fe36d8f 100644
--- a/harbour/contrib/gd/make_vc.bat
+++ b/harbour/contrib/gd/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%GD_DIR%\include
+set CFLAGS=-I%GD_DIR%\include
 set HB_DLL_NAME=bgd
 set HB_DLL_DIR=%GD_DIR%\bin
 
diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat
index 22346c35ab..b791c3addc 100644
--- a/harbour/contrib/hbzlib/make_b32.bat
+++ b/harbour/contrib/hbzlib/make_b32.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-set CFLAGS=%C_USR% -Iinclude -DZLIB_DLL;WIN32;ASSERT -vi -Ve -6 -R- -H- -5 -OS -w- -X- -a8 -b -k-
+set CFLAGS=-Iinclude -DZLIB_DLL;WIN32;ASSERT -vi -Ve -6 -R- -H- -5 -OS -w- -X- -a8 -b -k-
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat
index 4ad62a3fcc..72b40b4ae6 100644
--- a/harbour/contrib/hbzlib/make_vc.bat
+++ b/harbour/contrib/hbzlib/make_vc.bat
@@ -3,6 +3,6 @@ rem
 rem $Id$
 rem
 
-set CFLAGS=%C_USR% -Iinclude -DZLIB_DLL;WIN32;ASSERT
+set CFLAGS=-Iinclude -DZLIB_DLL;WIN32;ASSERT
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/mysql/make_b32.bat b/harbour/contrib/mysql/make_b32.bat
index 9284e34151..37591dae86 100644
--- a/harbour/contrib/mysql/make_b32.bat
+++ b/harbour/contrib/mysql/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
 set HB_DLL_NAME=libmySQL
 set HB_DLL_DIR=%MYSQL_DIR%\bin
 
diff --git a/harbour/contrib/mysql/make_vc.bat b/harbour/contrib/mysql/make_vc.bat
index c4c6470752..151e9464f2 100644
--- a/harbour/contrib/mysql/make_vc.bat
+++ b/harbour/contrib/mysql/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%MYSQL_DIR%\include -DHB_OS_WIN_32_USED
 set HB_DLL_NAME=libmySQL
 set HB_DLL_DIR=%MYSQL_DIR%\bin
 
diff --git a/harbour/contrib/pdflib/make_b32.bat b/harbour/contrib/pdflib/make_b32.bat
index 6e6b6ce671..1cbf8a92ea 100644
--- a/harbour/contrib/pdflib/make_b32.bat
+++ b/harbour/contrib/pdflib/make_b32.bat
@@ -14,6 +14,6 @@ exit 1
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
 
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/pdflib/make_vc.bat b/harbour/contrib/pdflib/make_vc.bat
index d6242fda8f..65fd67e13d 100644
--- a/harbour/contrib/pdflib/make_vc.bat
+++ b/harbour/contrib/pdflib/make_vc.bat
@@ -14,6 +14,6 @@ exit 1
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PDFLIB_DIR%\src\pdflib -DHB_OS_WIN_32_USED
 
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/pgsql/make_b32.bat b/harbour/contrib/pgsql/make_b32.bat
index cf5fd55da4..4edc3d91d4 100644
--- a/harbour/contrib/pgsql/make_b32.bat
+++ b/harbour/contrib/pgsql/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
 rem .exe
 set HB_DLL_NAME=postgres
 set HB_DLL_DIR=%PGSQL_DIR%\bin
diff --git a/harbour/contrib/pgsql/make_vc.bat b/harbour/contrib/pgsql/make_vc.bat
index 5641e79bee..91f30a728a 100644
--- a/harbour/contrib/pgsql/make_vc.bat
+++ b/harbour/contrib/pgsql/make_vc.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%PGSQL_DIR%\include -DHB_OS_WIN_32_USED
 rem .exe
 set HB_DLL_NAME=postgres
 set HB_DLL_DIR=%PGSQL_DIR%\bin
diff --git a/harbour/contrib/rdd_ads/make_b32.bat b/harbour/contrib/rdd_ads/make_b32.bat
index 6c50982c4b..2fd98b59f9 100644
--- a/harbour/contrib/rdd_ads/make_b32.bat
+++ b/harbour/contrib/rdd_ads/make_b32.bat
@@ -15,7 +15,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%ADS_DIR%
+set CFLAGS=-I%ADS_DIR%
 set HB_DLL_NAME=ace32
 if exist "%ADS_DIR%\32bit\%HB_DLL_NAME%.dll"        set HB_DLL_DIR=%ADS_DIR%\32bit
 if exist "%ADS_DIR%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\Redistribute
diff --git a/harbour/contrib/rdd_ads/make_vc.bat b/harbour/contrib/rdd_ads/make_vc.bat
index 17267d3022..508028d07c 100644
--- a/harbour/contrib/rdd_ads/make_vc.bat
+++ b/harbour/contrib/rdd_ads/make_vc.bat
@@ -15,7 +15,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=%C_USR% -I%ADS_DIR%
+set CFLAGS=-I%ADS_DIR%
 set HB_DLL_NAME=ace32
 if exist "%ADS_DIR%\32bit\%HB_DLL_NAME%.dll"        set HB_DLL_DIR=%ADS_DIR%\32bit
 if exist "%ADS_DIR%\Redistribute\%HB_DLL_NAME%.dll" set HB_DLL_DIR=%ADS_DIR%\Redistribute
diff --git a/harbour/contrib/what32/make_b32.bat b/harbour/contrib/what32/make_b32.bat
index c484512c4c..67aae59223 100644
--- a/harbour/contrib/what32/make_b32.bat
+++ b/harbour/contrib/what32/make_b32.bat
@@ -3,4 +3,6 @@ rem
 rem $Id$
 rem
 
+set HARBOURFLAGS=-I..\xhb
+
 call ..\mtpl_b32.bat %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/harbour/contrib/what32/make_vc.bat b/harbour/contrib/what32/make_vc.bat
index 4ceb9b9261..ca98bf40bc 100644
--- a/harbour/contrib/what32/make_vc.bat
+++ b/harbour/contrib/what32/make_vc.bat
@@ -3,4 +3,6 @@ rem
 rem $Id$
 rem
 
+set HARBOURFLAGS=-I..\xhb
+
 call ..\mtpl_vc.bat %1 %2 %3 %4 %5 %6 %7 %8 %9