diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 04d2cbdf59..fd183994e6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,63 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-29 14:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * package/harbour-win.spec
+  * package/harbour-wce.spec
+  * config/global.mk
+  * INSTALL
+    * Renamed HB_BIN_COMPILE to HB_HOST_BIN
+      (old pending TODO)
+
+  * tests/flink.prg
+    + Added comment.
+    + Added example to dir symlink.
+
+  * contrib/hbpre.hbm
+    + Added comments.
+
+  * config/beos/gcc.mk
+  * config/global.mk
+  * config/qnx/gcc.mk
+  * config/bsd/gcc.mk
+  * config/bsd/clang.mk
+  * config/bsd/pcc.mk
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+  * config/wce/msvcarm.mk
+  * config/vxworks/gcc.mk
+  * config/vxworks/diab.mk
+  * config/darwin/gcc.mk
+  * config/darwin/icc.mk
+  * config/darwin/clang.mk
+  * config/hpux/gcc.mk
+  * config/dos/watcom.mk
+  * config/dos/djgpp.mk
+  * config/c.mk
+  * config/win/xcc.mk
+  * config/win/mingw.mk
+  * config/win/pocc.mk
+  * config/win/bcc.mk
+  * config/win/watcom.mk
+  * config/win/icc.mk
+  * config/win/cygwin.mk
+  * config/win/msvc.mk
+  * config/linux/watcom.mk
+  * config/linux/gcc.mk
+  * config/linux/icc.mk
+  * config/linux/clang.mk
+  * config/linux/sunpro.mk
+  * config/rules.mk
+  * config/os2/watcom.mk
+  * config/os2/gcc.mk
+  * config/sunos/gcc.mk
+  * config/sunos/sunpro.mk
+    * Renamed HB_INC_COMPILE to HB_HOST_INC
+      (it's still not precise name, just in sync with HB_HOST_BIN.
+      In Harbour there is no difference between headers accross
+      the platforms, so they could just be called something more
+      neutral. If you have an idea, pls speak up.)
+
 2010-07-29 14:12 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/hbsocket.c
     ! hb_socketBind((): Deleted hb_socketSetReuseAddr() call,
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 62d37ec46a..e132648973 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -733,7 +733,7 @@ HARBOUR
 
    Point this envvar to the directory where native Harbour executables
    for your host platform can be found:
-      HB_BIN_COMPILE=<HARBOUR_NATIVE_BUILD_DIR>\bin
+      HB_HOST_BIN=<HARBOUR_NATIVE_BUILD_DIR>\bin
 
    If you leave this value empty, the make system will try to autodetect it,
    so in practice all you have to do is to create a native build first (no
@@ -1182,7 +1182,7 @@ HARBOUR
       local directory and start over. See HOW TO GET THE HARBOUR SOURCES
       section for instructions to get the source.
    4. If you are doing a cross-build, make sure to have rebuilt the native
-      Harbour executables for your host platform. See 'HB_BIN_COMPILE'
+      Harbour executables for your host platform. See 'HB_HOST_BIN'
       build messages to find their location.
    5. Keep your PATH clean from old, mixed compiler tools or other Harbour
       versions when building Harbour. The surest way to achieve this is to
diff --git a/harbour/config/beos/gcc.mk b/harbour/config/beos/gcc.mk
index 9ab7f95bd8..229aa6ac13 100644
--- a/harbour/config/beos/gcc.mk
+++ b/harbour/config/beos/gcc.mk
@@ -18,7 +18,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/bsd/clang.mk b/harbour/config/bsd/clang.mk
index 29227aeac4..507581e7dd 100644
--- a/harbour/config/bsd/clang.mk
+++ b/harbour/config/bsd/clang.mk
@@ -26,7 +26,7 @@ else
 endif
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk
index b24f205f3b..bb35fa74a5 100644
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -16,7 +16,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/bsd/pcc.mk b/harbour/config/bsd/pcc.mk
index c83b516b87..499b1b13bf 100644
--- a/harbour/config/bsd/pcc.mk
+++ b/harbour/config/bsd/pcc.mk
@@ -16,7 +16,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o$(subst x,x, )
 
-CFLAGS += -I. -I$(HB_INC_COMPILE) -fpic
+CFLAGS += -I. -I$(HB_HOST_INC) -fpic
 
 # Warning and optimization options are not stable yet
 #ifneq ($(HB_BUILD_WARN),no)
diff --git a/harbour/config/c.mk b/harbour/config/c.mk
index 794866c024..cd51030c6f 100644
--- a/harbour/config/c.mk
+++ b/harbour/config/c.mk
@@ -13,7 +13,7 @@ ifdef YACC_SOURCE
    YACC_H := y_tab.h
    YACC_OUTPUT := $(YACC_C:.c=.out)
    YACC_OBJ := $(YACC_C:.c=$(OBJ_EXT))
-   YACC_HB_H := $(foreach h, $(YACC_HEADERS), $(HB_INC_COMPILE)/$(h))
+   YACC_HB_H := $(foreach h, $(YACC_HEADERS), $(HB_HOST_INC)/$(h))
    ifneq ($(YACC_DEPEND),)
       $(foreach f, $(YACC_DEPEND), $(f:.c=$(OBJ_EXT))) : $(YACC_C)
    endif
diff --git a/harbour/config/darwin/clang.mk b/harbour/config/darwin/clang.mk
index 316c711424..86e143d93f 100644
--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -22,7 +22,7 @@ endif
 # NOTE: Works also without the ending space after -o.
 CC_OUT := -o$(subst x,x, )
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 # -fno-common enables building .dylib files
 CFLAGS += -fno-common
diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk
index 4ad2948749..548991ac8f 100644
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -20,7 +20,7 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 # -no-cpp-precomp prevents from using buggy precompiled headers
 # CFLAGS += -no-cpp-precomp
diff --git a/harbour/config/darwin/icc.mk b/harbour/config/darwin/icc.mk
index dcf3670b8e..e42bbbbe1e 100644
--- a/harbour/config/darwin/icc.mk
+++ b/harbour/config/darwin/icc.mk
@@ -16,7 +16,7 @@ CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 CFLAGS += -D_GNU_SOURCE
 
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index b3dbd894ea..bf632acaa3 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -17,7 +17,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk
index 47b99d6be3..060ffd3595 100644
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -42,7 +42,7 @@ ifneq ($(HB_BUILD_OPTIM),no)
    endif
 endif
 
-CFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_HOST_INC)
 
 ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -d2
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 8947904378..9bb1aed52c 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -220,14 +220,6 @@ ifeq ($(HB_INIT_DONE),)
       endif
    endif
 
-   # Some additional ones to be given a standard name:
-   #   HB_BIN_COMPILE              -> HB_BUILD_BIN_DIR
-   #   HB_INC_COMPILE              -> - (HB_BUILD_INC_DIR)
-   #   HB_DLLIBS                   -> (only used in one location, so it's a local matter)
-   #   HB_TOOLS_PREF               -> ?
-   # Macros:
-   #   -DHB_GT_LIB=
-
    $(info ! Building Harbour $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE)$(HB_VER_STATUS) from source - http://harbour-project.org)
    $(info ! MAKE: $(MAKE) $(MAKE_VERSION) $(SHELL) $(HB_MAKECMDGOALS) $(MAKEFLAGS) $(if $(MAKESHELL),MAKESHELL: $(MAKESHELL),))
    ifneq ($(HB_USER_PRGFLAGS),)
@@ -418,7 +410,7 @@ ifeq ($(HB_HOST_PLAT),)
       HB_HOST_PLAT := win
       ifeq ($(OS),)
          HB_HOST_PLAT_WIN9X := yes
-         ifeq ($(HB_BIN_COMPILE),)
+         ifeq ($(HB_HOST_BIN),)
             ifneq ($(HB_BUILD_UNICODE),no)
                export HB_BUILD_UNICODE := no
                $(info ! Win9x/ME host detected: HB_BUILD_UNICODE forced to 'no')
@@ -633,8 +625,8 @@ ifeq ($(HB_COMPILER),)
                HB_COMP_PATH := $(dir $(HB_CCPATH))
                HB_COMPILER := mingw
                HB_PLATFORM := win
-               ifeq ($(HB_TOOLS_PREF),)
-                  export HB_TOOLS_PREF := hbw
+               ifeq ($(HB_HBPREFIX),)
+                  export HB_HBPREFIX := win-
                endif
                export HB_BUILD_EXTDEF := no
                ifneq ($(HB_BUILD_PARTS),all)
@@ -698,8 +690,8 @@ ifeq ($(HB_COMPILER),)
             ifneq ($(HB_CCPATH)$(HB_CCPREFIX),)
                HB_COMP_PATH := $(dir $(HB_CCPATH))
                HB_PLATFORM := wce
-               ifeq ($(HB_TOOLS_PREF),)
-                  export HB_TOOLS_PREF := hbce
+               ifeq ($(HB_HBPREFIX),)
+                  export HB_HBPREFIX := wce-
                endif
                export HB_BUILD_EXTDEF := no
                ifneq ($(HB_BUILD_PARTS),all)
@@ -740,8 +732,8 @@ ifeq ($(HB_COMPILER),)
             ifneq ($(HB_CCPATH)$(HB_CCPREFIX),)
                HB_COMP_PATH := $(dir $(HB_CCPATH))
                HB_PLATFORM := dos
-               ifeq ($(HB_TOOLS_PREF),)
-                  export HB_TOOLS_PREF := hbdos
+               ifeq ($(HB_HBPREFIX),)
+                  export HB_HBPREFIX := dos-
                endif
                export HB_BUILD_EXTDEF := no
                ifneq ($(HB_BUILD_PARTS),all)
@@ -1290,7 +1282,7 @@ DFLAGS :=
 
 HB_CROSS_BUILD :=
 ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
-   ifeq ($(HB_BIN_COMPILE),)
+   ifeq ($(HB_HOST_BIN),)
       # Not required in these combinations: [vszakats]
       # 'Same platform, x86_64 host, x86 target'
       ifneq ($(HB_HOST_PLAT)-$(HB_HOST_CPU)-$(HB_CPU),$(HB_PLATFORM)-x86_64-x86)
@@ -1303,26 +1295,26 @@ ifneq ($(HB_HOST_PLAT)$(HB_HOST_CPU),$(HB_PLATFORM)$(HB_CPU))
             else
                _HB_ROOT_BIN := $(TOP)$(ROOT)
             endif
-            HB_BIN_COMPILE := $(dir $(firstword $(wildcard $(_HB_ROOT_BIN)bin/$(HB_HOST_PLAT)/*/harbour$(HB_HOST_BIN_EXT))))
-            ifneq ($(HB_BIN_COMPILE),)
+            HB_HOST_BIN := $(dir $(firstword $(wildcard $(_HB_ROOT_BIN)bin/$(HB_HOST_PLAT)/*/harbour$(HB_HOST_BIN_EXT))))
+            ifneq ($(HB_HOST_BIN),)
                ifeq ($(HB_SRC_ROOTPATH),)
-                  HB_BIN_COMPILE := $(realpath $(HB_BIN_COMPILE))
+                  HB_HOST_BIN := $(realpath $(HB_HOST_BIN))
                endif
             else
                # Look in PATH
-               HB_BIN_COMPILE := $(dir $(call find_in_path,harbour))
+               HB_HOST_BIN := $(dir $(call find_in_path,harbour))
             endif
-            ifeq ($(HB_BIN_COMPILE),)
-               $(warning ! Warning: HB_BIN_COMPILE not specified. Could not find native build.)
+            ifeq ($(HB_HOST_BIN),)
+               $(warning ! Warning: HB_HOST_BIN not specified. Could not find host native build.)
             else
-               $(info ! HB_BIN_COMPILE not specified. Automatically set to: $(HB_BIN_COMPILE))
+               $(info ! HB_HOST_BIN not specified. Automatically set to: $(HB_HOST_BIN))
             endif
          endif
       endif
-      export HB_BIN_COMPILE
+      export HB_HOST_BIN
    else
       ifeq ($(HB_INIT_DONE),)
-         $(info ! HB_BIN_COMPILE: $(HB_BIN_COMPILE))
+         $(info ! HB_HOST_BIN: $(HB_HOST_BIN))
       endif
       HB_CROSS_BUILD := yes
    endif
@@ -1671,14 +1663,14 @@ endif
 
 export HB_OBJ_DIR := $(subst /,$(DIRSEP),$(OBJ_DIR))
 
-ifeq ($(HB_BIN_COMPILE),)
+ifeq ($(HB_HOST_BIN),)
    HB_HOST_BIN_DIR := $(BIN_DIR)
 else
-   HB_HOST_BIN_DIR := $(HB_BIN_COMPILE)
+   HB_HOST_BIN_DIR := $(HB_HOST_BIN)
 endif
 
-ifeq ($(HB_INC_COMPILE),)
-   HB_INC_COMPILE := $(TOP)$(ROOT)include
+ifeq ($(HB_HOST_INC),)
+   HB_HOST_INC := $(TOP)$(ROOT)include
 endif
 
 ifeq ($(HB_INIT_DONE),)
diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk
index ea5f4820da..0a9b30d846 100644
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -18,7 +18,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 # uncomment this if you want to force creating 64bit binaries on IA64
 #CFLAGS += -mlp64
diff --git a/harbour/config/linux/clang.mk b/harbour/config/linux/clang.mk
index 2a76f29911..7d9ae641da 100644
--- a/harbour/config/linux/clang.mk
+++ b/harbour/config/linux/clang.mk
@@ -28,7 +28,7 @@ else
 endif
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk
index e4f0c957fe..44b5d5a63b 100644
--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -20,7 +20,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/linux/icc.mk b/harbour/config/linux/icc.mk
index d3e0f037c3..d0e204c01c 100644
--- a/harbour/config/linux/icc.mk
+++ b/harbour/config/linux/icc.mk
@@ -18,7 +18,7 @@ CC := $(HB_CCACHE) $(HB_CMP)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 CFLAGS += -D_GNU_SOURCE
 #CFLAGS += -fast
diff --git a/harbour/config/linux/sunpro.mk b/harbour/config/linux/sunpro.mk
index 8b2e90452b..b8b7672ce5 100644
--- a/harbour/config/linux/sunpro.mk
+++ b/harbour/config/linux/sunpro.mk
@@ -22,7 +22,7 @@ CC_OUT := -o$(subst x,x, )
 
 CXX := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)sunCC$(HB_CCPOSTFIX)
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 # try to keep `-fast' as left as possible, as later optim
 # flags may override values set by `-fast', and this way
diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk
index 8f8271be47..e1eed4d334 100644
--- a/harbour/config/linux/watcom.mk
+++ b/harbour/config/linux/watcom.mk
@@ -43,7 +43,7 @@ else
    CFLAGS += -3r
 endif
 
-CFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_HOST_INC)
 
 ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -d2
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 1d7117a509..e8de6394f5 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -20,7 +20,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifeq ($(HB_COMPILER),gccomf)
    CFLAGS += -Zomf
diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk
index 917b7e8ee8..7e2c6d8a66 100644
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -51,7 +51,7 @@ else
    CFLAGS += -3r
 endif
 
-CFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_HOST_INC)
 
 ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -d2
diff --git a/harbour/config/qnx/gcc.mk b/harbour/config/qnx/gcc.mk
index e4f0c957fe..44b5d5a63b 100644
--- a/harbour/config/qnx/gcc.mk
+++ b/harbour/config/qnx/gcc.mk
@@ -20,7 +20,7 @@ CC := $(HB_CCACHE) $(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/rules.mk b/harbour/config/rules.mk
index edd78ba262..69fc1056aa 100644
--- a/harbour/config/rules.mk
+++ b/harbour/config/rules.mk
@@ -32,7 +32,7 @@ endif
 # How to run Harbour
 HB := $(HB_HOST_BIN_DIR)/harbour$(HB_HOST_BIN_EXT)
 HB_FLAGS := -n1 -q0 -w3 -es2 -kmo -i- $(HB_PRGFLAGS)
-HB_RULE = $(HB) $? $(HB_INC_DEPEND) -i$(HB_INC_COMPILE) $(HB_FLAGS) $(HB_USER_PRGFLAGS)
+HB_RULE = $(HB) $? $(HB_INC_DEPEND) -i$(HB_HOST_INC) $(HB_FLAGS) $(HB_USER_PRGFLAGS)
 
 # Use default rules if platform/compiler specific rule is not defined
 
diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk
index cacf66823c..17bae80e3a 100644
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -20,7 +20,7 @@ CC_IN := -c
 #       Now solved with '$(subst x,x, )' expression.
 CC_OUT := -o$(subst x,x, )
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index 8e3b40b89d..85a26057d2 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -27,7 +27,7 @@ CC_OUT := -o$(subst x,x, )
 
 CXX := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)sunCC$(HB_CCPOSTFIX)
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 # try to keep `-fast' as left as possible, as later optim
 # flags may override values set by `-fast', and this way
diff --git a/harbour/config/vxworks/diab.mk b/harbour/config/vxworks/diab.mk
index c5d9f043c2..7e0e50e8cd 100644
--- a/harbour/config/vxworks/diab.mk
+++ b/harbour/config/vxworks/diab.mk
@@ -48,7 +48,7 @@ CFLAGS += -t$(_DIAB_CPU):rtp -WDVSB_DIR=$(WIND_BASE)/target/lib
 LDFLAGS += -t$(_DIAB_CPU):rtp -WDVSB_DIR=$(WIND_BASE)/target/lib
 DFLAGS += -t$(_DIAB_CPU):rtp -WDVSB_DIR=$(WIND_BASE)/target/lib
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 CFLAGS += -I$(WIND_BASE)/target/usr/h
 CFLAGS += -I$(WIND_BASE)/target/usr/h/wrn/coreip
 CFLAGS += -D_VX_CPU=$(_HB_VXCPU)
diff --git a/harbour/config/vxworks/gcc.mk b/harbour/config/vxworks/gcc.mk
index 9c454f1ff9..f71444d3cc 100644
--- a/harbour/config/vxworks/gcc.mk
+++ b/harbour/config/vxworks/gcc.mk
@@ -24,7 +24,7 @@ CFLAGS += -mrtp
 LDFLAGS += -mrtp
 DFLAGS += -mrtp
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 CFLAGS += -I$(WIND_BASE)/target/usr/h
 CFLAGS += -I$(WIND_BASE)/target/usr/h/wrn/coreip
 CFLAGS += -fno-strict-aliasing
diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk
index eaf97ac45f..bc4c5f2163 100644
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -16,7 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk
index 92f96badf0..1886c1e955 100644
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -17,7 +17,7 @@ endif
 CC_IN := -c
 CC_OUT := -Fo
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 CFLAGS += -nologo
 
diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk
index b570868a7d..78ee405f15 100644
--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -14,7 +14,7 @@ CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 # Required by pocc Windows headers
 CFLAGS += -D_WINCE
 
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index 63655fa465..d2f2a4bfe3 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -14,7 +14,7 @@ CC := bcc32.exe
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 CFLAGS += -q -tWM -CP437
 
diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk
index 55c8eceb8f..ac985c328d 100644
--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -16,7 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 ifneq ($(HB_BUILD_WARN),no)
    CFLAGS += -W -Wall
diff --git a/harbour/config/win/icc.mk b/harbour/config/win/icc.mk
index 39a8b8fbfa..d6e05b70fd 100644
--- a/harbour/config/win/icc.mk
+++ b/harbour/config/win/icc.mk
@@ -14,7 +14,7 @@ CC := icl.exe
 CC_IN := -c
 CC_OUT := -Fo
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 CFLAGS += -nologo -Gs
 
diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk
index b90d9fab66..5722c45b24 100644
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -16,7 +16,7 @@ CC := $(HB_CCPATH)$(HB_CCPREFIX)$(HB_CMP)$(HB_CCPOSTFIX)
 CC_IN := -c
 CC_OUT := -o
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 # Equivalent to MSVC -GS (default) option:
 ifeq ($(filter $(HB_COMPILER_VER),29 34 40),)
diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk
index a23861e8c4..8ad0d34954 100644
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -12,7 +12,7 @@ CC := cl.exe
 CC_IN := -c
 CC_OUT := -Fo
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 CFLAGS += -nologo
 
diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk
index 1eeb941db4..6103a0d7a9 100644
--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -14,7 +14,7 @@ CC := pocc.exe
 CC_IN := -c
 CC_OUT := -Fo
 
-CFLAGS += -I. -I$(HB_INC_COMPILE)
+CFLAGS += -I. -I$(HB_HOST_INC)
 
 CFLAGS += -Ze -Go -MT
 
diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk
index 815c1f345a..aff001de94 100644
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -45,7 +45,7 @@ else
    CFLAGS += -3s
 endif
 
-CFLAGS += -i. -i$(HB_INC_COMPILE)
+CFLAGS += -i. -i$(HB_HOST_INC)
 
 ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -d2
diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk
index 3fabdb153c..b3b7e2e907 100644
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -14,7 +14,7 @@ CC := xCC.exe
 CC_IN := -c
 CC_OUT := -Fo
 
-CFLAGS += -I. -I$(HB_INC_COMPILE) -I$(TOP). -I$(TOP)..
+CFLAGS += -I. -I$(HB_HOST_INC) -I$(TOP). -I$(TOP)..
 ifeq ($(HB_SHELL),sh)
    CFLAGS := $(subst /,\\,$(CFLAGS))
 else
diff --git a/harbour/contrib/hbpre.hbm b/harbour/contrib/hbpre.hbm
index eda2ef4ee0..6540898c6c 100644
--- a/harbour/contrib/hbpre.hbm
+++ b/harbour/contrib/hbpre.hbm
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+# These may be overridden by local project options.
+
 -q0
 
 {HB_BUILD_VERBOSE}-quiet-
diff --git a/harbour/package/harbour-wce.spec b/harbour/package/harbour-wce.spec
index 03eea62cc4..523613718d 100644
--- a/harbour/package/harbour-wce.spec
+++ b/harbour/package/harbour-wce.spec
@@ -82,7 +82,7 @@ unset HB_BUILD_CONTRIBS
 
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=wce
-export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
+export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
 
 make %{?_smp_mflags}
 
@@ -98,7 +98,7 @@ unset HB_COMPILER
 
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=wce
-export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
+export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
 
 export HB_INSTALL_BIN=$RPM_BUILD_ROOT/%{_bindir}
 export HB_INSTALL_INC=$RPM_BUILD_ROOT/%{_includedir}/%{name}
diff --git a/harbour/package/harbour-win.spec b/harbour/package/harbour-win.spec
index 30c8c7209a..7936ce2d28 100644
--- a/harbour/package/harbour-win.spec
+++ b/harbour/package/harbour-win.spec
@@ -82,7 +82,7 @@ unset HB_BUILD_CONTRIBS
 
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=win
-export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
+export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
 
 make %{?_smp_mflags}
 
@@ -98,7 +98,7 @@ unset HB_COMPILER
 
 export HB_BUILD_PARTS=lib
 export HB_PLATFORM=win
-export HB_BIN_COMPILE="$(pwd)/bin/linux/gcc"
+export HB_HOST_BIN="$(pwd)/bin/linux/gcc"
 
 export HB_INSTALL_BIN=$RPM_BUILD_ROOT/%{_bindir}
 export HB_INSTALL_INC=$RPM_BUILD_ROOT/%{_includedir}/%{name}
diff --git a/harbour/tests/flink.prg b/harbour/tests/flink.prg
index 9356fd8ac3..2b1445d870 100644
--- a/harbour/tests/flink.prg
+++ b/harbour/tests/flink.prg
@@ -14,20 +14,28 @@
 
 PROCEDURE Main()
 
-   hb_MemoWrit( "_hb_h.txt", ">h.txt<" )
+   hb_MemoWrit( "_hb_h.tmp", ">h.tmp<" )
 
    ? HB_FLINK()
-   ? FERROR(), DOSERROR()
+   ? FERROR()
 
-   ? HB_FLINK( "_hb_h.txt", "_hb_hlnk.txt" )
-   ? FERROR(), DOSERROR()
+   ? HB_FLINK( "_hb_h.tmp", "_hb_hlnk.tmp" )
+   ? FERROR()
 
-   hb_MemoWrit( "_hb_s.txt", ">s.txt<" )
+   hb_MemoWrit( "_hb_s.tmp", ">s.tmp<" )
+
+   /* Requires special rights on Windows system,
+      by default Administrators are allowed. */
 
    ? HB_FLINKSYM()
-   ? FERROR(), DOSERROR()
+   ? FERROR()
 
-   ? HB_FLINKSYM( "_hb_s.txt", "_hb_slnk.txt" )
-   ? FERROR(), DOSERROR()
+   ? HB_FLINKSYM( "_hb_s.tmp", "_hb_slnk.tmp" )
+   ? FERROR()
+
+   MakeDir( "_hb_d" )
+
+   ? HB_FLINKSYM( "_hb_d.tmp", "_hb_dlnk.tmp" )
+   ? FERROR()
 
    RETURN