diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 186ef6b81e..244a31445b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,35 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-10 17:23 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbtpathy/telepath.prg
+    ! Fixed forming default COM port names on Windows NT
+      systems. (I didn't test Win9x, but I assume they work
+      like DOS regarding this aspect).
+
+  * contrib/hbxbp/Makefile
+  * contrib/gtwvg/Makefile
+    ! Using HB_INC_DEPEND instead of modifying HB_USER_PRGFLAGS
+      and HB_USER_CFLAGS. Old solution wasn't good because the
+      new include dirs were added after central ones, so central
+      ones effectively masked them and wrong headers could be
+      picked through the build.
+
+  * config/rules.cf
+    + Added HB_INC_DEPEND variable to store dirs which should
+      be included before central include dir.
+
+  * config/global.cf
+    * Small change in predefined HB_BUILD_NAMEs. Unicode 'u'
+      marker moved to end, C++ marked changed to 'p' (from 'x').
+
+  * contrib/rddado/rddado.hbc
+  * contrib/gtwvg/gtwvg.hbc
+    * Slash sync with other .hbc files. (forward slash is used)
+
+  * config/dos/watcom.cf
+    % Minor opt in operator.
+
 2009-08-10 15:58 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/instsh.cf
   * config/dirsh.cf
diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf
index 581c0d0236..82023c273a 100644
--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -140,4 +140,4 @@ include $(TOP)$(ROOT)config/rules.cf
 
 # work arround to DOS command line size limit
 export HARBOURCMD := $(HB_FLAGS)
-HB_FLAGS =
+HB_FLAGS :=
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index 10c88171fc..55ed9d1f90 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -119,19 +119,19 @@ ifneq ($(HB_BUILD_NAME),)
       HB_BUILD_UNICODE := no
       HB_BUILD_MODE ?= c
    else
-   ifeq ($(HB_BUILD_NAME),.rx)
-      HB_BUILD_DEBUG := no
-      HB_BUILD_OPTIM := yes
-      HB_BUILD_UNICODE := no
-      HB_BUILD_MODE ?= cpp
-   else
    ifeq ($(HB_BUILD_NAME),.ru)
       HB_BUILD_DEBUG := no
       HB_BUILD_OPTIM := yes
       HB_BUILD_UNICODE := yes
       HB_BUILD_MODE ?= c
    else
-   ifeq ($(HB_BUILD_NAME),.rux)
+   ifeq ($(HB_BUILD_NAME),.rp)
+      HB_BUILD_DEBUG := no
+      HB_BUILD_OPTIM := yes
+      HB_BUILD_UNICODE := no
+      HB_BUILD_MODE ?= cpp
+   else
+   ifeq ($(HB_BUILD_NAME),.rpu)
       HB_BUILD_DEBUG := no
       HB_BUILD_OPTIM := yes
       HB_BUILD_UNICODE := yes
@@ -143,19 +143,19 @@ ifneq ($(HB_BUILD_NAME),)
       HB_BUILD_UNICODE := no
       HB_BUILD_MODE ?= c
    else
-   ifeq ($(HB_BUILD_NAME),.dx)
-      HB_BUILD_DEBUG := yes
-      HB_BUILD_OPTIM := no
-      HB_BUILD_UNICODE := no
-      HB_BUILD_MODE ?= cpp
-   else
    ifeq ($(HB_BUILD_NAME),.du)
       HB_BUILD_DEBUG := yes
       HB_BUILD_OPTIM := no
       HB_BUILD_UNICODE := yes
       HB_BUILD_MODE ?= c
    else
-   ifeq ($(HB_BUILD_NAME),.dux)
+   ifeq ($(HB_BUILD_NAME),.dp)
+      HB_BUILD_DEBUG := yes
+      HB_BUILD_OPTIM := no
+      HB_BUILD_UNICODE := no
+      HB_BUILD_MODE ?= cpp
+   else
+   ifeq ($(HB_BUILD_NAME),.dpu)
       HB_BUILD_DEBUG := yes
       HB_BUILD_OPTIM := no
       HB_BUILD_UNICODE := yes
diff --git a/harbour/config/rules.cf b/harbour/config/rules.cf
index edb62b1a84..c907f54299 100644
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -27,18 +27,18 @@ ifeq ($(HB_GCMODE),)
    HB_GCMODE := 0
 endif
 HB_FLAGS := -i$(HB_INC_COMPILE) -q0 -w3 -es2 -kmo $(HB_PDBG)
-HB_RULE = $(HB) $? -n1 $(HB_FLAGS) -gc$(HB_GCMODE) $(HB_FLAGSEXTRA) $(HB_USER_PRGFLAGS)
+HB_RULE = $(HB) $? -n1 $(HB_INC_DEPEND) $(HB_FLAGS) -gc$(HB_GCMODE) $(HB_FLAGSEXTRA) $(HB_USER_PRGFLAGS)
 
 # Use default rules if architecture/compiler specific rule is not defined
 
 # The rule to compile a C source file.
 ifeq ($(CC_RULE),)
-   CC_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN) $< $(CC_OUT)$(<F:.c=$(OBJ_EXT))
+   CC_RULE = $(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN) $< $(CC_OUT)$(<F:.c=$(OBJ_EXT))
 endif
 
 # The rule to compile a C++ source file.
 ifeq ($(CPP_RULE),)
-   CPP_RULE = $(CC) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN) $< $(CC_OUT)$(<F:.cpp=$(OBJ_EXT))
+   CPP_RULE = $(CC) $(HB_INC_DEPEND) $(CPPFLAGS) $(CFLAGS) $(HB_CDBG) $(HB_USER_CFLAGS) $(HB_CDYNLIB) $(HB_CUNICODE) $(CC_IN) $< $(CC_OUT)$(<F:.cpp=$(OBJ_EXT))
 endif
 
 # The rule to link an executable.
diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile
index c1a49b8871..70907538b2 100644
--- a/harbour/contrib/gtwvg/Makefile
+++ b/harbour/contrib/gtwvg/Makefile
@@ -6,7 +6,7 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.cf
 
-HB_USER_CFLAGS += -I$(TOP)$(ROOT)contrib/hbwin
+HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin
 
 LIBNAME := gtwvg
 
diff --git a/harbour/contrib/gtwvg/gtwvg.hbc b/harbour/contrib/gtwvg/gtwvg.hbc
index bee6c31b40..d34a3e843e 100644
--- a/harbour/contrib/gtwvg/gtwvg.hbc
+++ b/harbour/contrib/gtwvg/gtwvg.hbc
@@ -7,6 +7,6 @@
 incpaths=.
 
 gt=gtwvg
-libs=..\hbwin\hbwin.hbc
+libs=../hbwin/hbwin.hbc
 gui=yes
 mt=yes
diff --git a/harbour/contrib/hbtpathy/telepath.prg b/harbour/contrib/hbtpathy/telepath.prg
index 75db629851..c10ab6f6ad 100644
--- a/harbour/contrib/hbtpathy/telepath.prg
+++ b/harbour/contrib/hbtpathy/telepath.prg
@@ -193,7 +193,11 @@ FUNCTION tp_open( nPort, nInSize, nOutSize, nBaud, nData, cParity, nStop, cPortn
    #if defined( __PLATFORM__UNIX )
       DEFAULT cPortName TO "/dev/ttyS" + iif( ISNUMBER( nPort ), hb_ntos( nPort - 1 ), "" )
    #else
-      DEFAULT cPortName TO "COM"       + iif( ISNUMBER( nPort ), hb_ntos( nPort ), "" )
+      IF hb_osIsWinNT()
+         DEFAULT cPortName TO "\\.\COM"   + iif( ISNUMBER( nPort ), hb_ntos( nPort ), "" )
+      ELSE
+         DEFAULT cPortName TO "COM"       + iif( ISNUMBER( nPort ), hb_ntos( nPort ), "" )
+      ENDIF
    #endif
 
    #if defined( __PLATFORM__UNIX )
diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile
index b8db963f33..961d5fd5f4 100644
--- a/harbour/contrib/hbxbp/Makefile
+++ b/harbour/contrib/hbxbp/Makefile
@@ -6,7 +6,7 @@ ROOT := ../../
 
 include $(TOP)$(ROOT)config/global.cf
 
-HB_USER_PRGFLAGS += -I$(TOP)$(ROOT)contrib/hbqt
+HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbqt
 
 LIBNAME := hbxbp
 
diff --git a/harbour/contrib/rddado/rddado.hbc b/harbour/contrib/rddado/rddado.hbc
index 20caa04fd0..a1a39f93c5 100644
--- a/harbour/contrib/rddado/rddado.hbc
+++ b/harbour/contrib/rddado/rddado.hbc
@@ -7,4 +7,4 @@
 incpaths=.
 
 libs=rddado
-libs=..\hbwin\hbwin.hbc
+libs=../hbwin/hbwin.hbc