diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 071588c287..1bf87c1d7c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,32 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-22 15:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/hpux/gcc.cf
+  * config/sunos/gcc.cf
+  * config/bsd/gcc.cf
+  * config/darwin/gcc.cf
+  * config/dos/djgpp.cf
+  * config/win/cygwin.cf
+  * config/win/mingw.cf
+  * config/win/bcc.cf
+  * config/linux/gcc.cf
+  * config/linux/icc.cf
+  * config/os2/gcc.cf
+  * config/wce/mingwarm.cf
+  * config/win/icc.cf
+    + Added support for HB_BUILD_MODE=cpp for all platforms
+      where it's available.
+      Now it's about in sync with hbmk2.
+
+  * config/linux/gpp.cf
+    * Changed to set HB_BUILD_MODE=cpp and redirect to gcc.
+      (retained for compatibility, pls use HB_BUILD_MODE=cpp instead
+      of HB_COMPILER=gpp)
+
+  * config/win/gcc.cf
+    * Now redirected to mingw (was cygwin).
+
 2009-06-22 13:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbrun/hbrun.hbp
   + utils/hbrun/hbrun.rc
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index e16daad0c0..69d66eec5a 100644
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_MODE),cpp)
+   HB_CMP = g++
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT =
 LIB_PREF = lib
 LIB_EXT = .a
 
-CC = $(HB_CCACHE) gcc
+CC = $(HB_CCACHE) $(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -27,7 +33,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -g
 endif
 
-LD = $(HB_CCACHE) gcc
+LD = $(HB_CCACHE) $(HB_CMP)
 LD_OUT = -o
 
 # Add all libraries specified in CONTRIBS and LIBS.
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index 6e4b93180a..0e5eaad2f8 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -4,7 +4,7 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
-ifeq ($(HB_COMPILER),gpp)
+ifeq ($(HB_BUILD_MODE),cpp)
    HB_CMP = g++
 else
    # for old Darwin systems (having GCC 2.95) this may need to be
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index a2037d61f6..240ea2f4df 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_MODE),cpp)
+   HB_CMP = gpp
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT = .exe
 LIB_PREF = lib
 LIB_EXT = .a
 
-CC = gcc
+CC = $(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -27,7 +33,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -g
 endif
 
-LD = gcc
+LD = $(HB_CMP)
 LD_OUT = -o
 LDLIBS = -lm
 
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index d16df8fb59..88d0a74697 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_MODE),cpp)
+   HB_CMP = g++
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT =
 LIB_PREF = lib
 LIB_EXT = .a
 
-CC = $(HB_CCACHE) gcc
+CC = $(HB_CCACHE) $(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -37,7 +43,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -g
 endif
 
-LD = $(HB_CCACHE) gcc
+LD = $(HB_CCACHE) $(HB_CMP)
 LD_OUT = -o
 
 # Add all libraries specified in CONTRIBS and LIBS.
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index 021493f25c..dd273433e2 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -4,10 +4,10 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
-ifeq ($(HB_COMPILER),gpp)
+ifeq ($(HB_BUILD_MODE),cpp)
    HB_CMP = g++
 else
-   HB_CMP = $(HB_COMPILER)
+   HB_CMP = gcc
 endif
 
 OBJ_EXT = .o
diff --git a/harbour/config/linux/gpp.cf b/harbour/config/linux/gpp.cf
index 85eb098523..db903a83d5 100644
--- a/harbour/config/linux/gpp.cf
+++ b/harbour/config/linux/gpp.cf
@@ -2,4 +2,6 @@
 # $Id$
 #
 
+HB_BUILD_MODE=cpp
+
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/gcc.cf
diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf
index 1bfa51a636..50bf2e0099 100644
--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -4,8 +4,11 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
-# set compiler name to icc or icpc
-HB_CMP = $(HB_COMPILER)
+ifeq ($(HB_BUILD_MODE),cpp)
+   HB_CMP = icpc
+else
+   HB_CMP = icc
+endif
 
 OBJ_EXT = .o
 EXE_EXT =
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index 66a7eddb76..9d77908676 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_CPP),yes)
+   HB_CMP = g++
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT = .exe
 LIB_PREF =
 LIB_EXT = .a
 
-CC = gcc
+CC = $(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -27,7 +33,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -g
 endif
 
-LD = gcc
+LD = $(HB_CMP)
 LDFLAGS =
 # NOTE: The ending space after -o is important, please preserve it.
 #       Now solved with '$(subst x,x, )' expression.
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index 195a6bd1a0..5a0877887e 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_MODE),cpp)
+   HB_CMP = g++
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT =
 LIB_PREF = lib
 LIB_EXT = .a
 
-CC = $(HB_CCACHE) gcc
+CC = $(HB_CCACHE) $(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -33,7 +39,7 @@ CFLAGS += -g
 endif
 
 
-LD = $(HB_CCACHE) gcc
+LD = $(HB_CCACHE) $(HB_CMP)
 LD_OUT = -o
 
 # Add all libraries specified in CONTRIBS and LIBS.
diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf
index b90e362610..f85c11f677 100644
--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_CPP),yes)
+   HB_CMP = g++
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT = .exe
 LIB_PREF = lib
 LIB_EXT = .a
 
-CC = $(HB_CCPREFIX)gcc
+CC = $(HB_CCPREFIX)$(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -29,7 +35,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -g
 endif
 
-LD = $(HB_CCPREFIX)gcc
+LD = $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT = -o
 LINKPATHS =
 LDLIBS =
diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf
index b5322aa632..72bf535ad8 100644
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -29,6 +29,10 @@ ifneq ($(HB_BUILD_OPTIM),no)
 CFLAGS += -d -6 -O2 -OS -Ov -Oi -Oc
 endif
 
+ifeq ($(HB_BUILD_MODE),cpp)
+CFLAGS += -P
+endif
+
 ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -y -v
 endif
diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf
index d89b478353..996cc6d7ef 100644
--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_MODE),cpp)
+   HB_CMP = g++
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT = .exe
 LIB_PREF = lib
 LIB_EXT = .a
 
-CC = gcc
+CC = $(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -28,7 +34,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -g
 endif
 
-LD = gcc
+LD = $(HB_CMP)
 LD_OUT = -o
 
 # Add all libraries specified in CONTRIBS and LIBS.
diff --git a/harbour/config/win/gcc.cf b/harbour/config/win/gcc.cf
index 9c2b94ab85..1c936a4fac 100644
--- a/harbour/config/win/gcc.cf
+++ b/harbour/config/win/gcc.cf
@@ -2,4 +2,4 @@
 # $Id$
 #
 
-include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/cygwin.cf
+include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/mingw.cf
diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf
index 55df116e0e..a0779951ae 100644
--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -18,6 +18,13 @@ CC_OUT = -Fo
 CPPFLAGS = -nologo -I. -I$(HB_INC_COMPILE)
 CFLAGS = -Gs
 
+ifeq ($(HB_BUILD_MODE),c)
+CPPFLAGS += -TC
+endif
+ifeq ($(HB_BUILD_MODE),cpp)
+CPPFLAGS += -TP
+endif
+
 ifneq ($(HB_BUILD_WARN),no)
 CFLAGS += -W3
 endif
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index 23bfe3a2af..b3c1ddccf7 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -4,12 +4,18 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/global.cf
 
+ifeq ($(HB_BUILD_MODE),cpp)
+   HB_CMP = g++
+else
+   HB_CMP = gcc
+endif
+
 OBJ_EXT = .o
 EXE_EXT = .exe
 LIB_PREF = lib
 LIB_EXT = .a
 
-CC = $(HB_CCPREFIX)gcc
+CC = $(HB_CCPREFIX)$(HB_CMP)
 CC_IN = -c
 CC_OUT = -o
 CPPFLAGS = -I. -I$(HB_INC_COMPILE)
@@ -31,7 +37,7 @@ ifeq ($(HB_BUILD_DEBUG),yes)
 CFLAGS += -g
 endif
 
-LD = $(HB_CCPREFIX)gcc
+LD = $(HB_CCPREFIX)$(HB_CMP)
 LD_OUT = -o
 LINKPATHS =
 LDLIBS =