diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4d4ed71d94..2d902351e1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-07-24 19:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * common.mak
+   * makefile.vc
+   * makefile.bc
+     * PPGEN -> HBPPGEN
+     * Some redundancies removed.
+     ! Redone and fixed my previous modifications.
+       (Thanks Marek and pls test this.)
+
 2007-07-24 14:35 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/debug/dbgentry.c
     ! cleaned memory leak in not freed trap on debugger exit
diff --git a/harbour/common.mak b/harbour/common.mak
index ea8eab2535..c2166ffe40 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -187,17 +187,10 @@ GTWIN_LIB    = $(LIB_DIR)\$(HB_LIB_PREFIX)gtwin$(HB_LIB_EXT)
 GTWVT_LIB    = $(LIB_DIR)\$(HB_LIB_PREFIX)gtwvt$(HB_LIB_EXT)
 GTGUI_LIB    = $(LIB_DIR)\$(HB_LIB_PREFIX)gtgui$(HB_LIB_EXT)
 
-# allows to do cross-compiling if neccesary.
-!ifndef HB_HARBOUR_EXE
-     HB_HARBOUR_EXE = $(BIN_DIR)\harbour$(HB_EXE_EXT)
-!endif
-
-# required (intermediate) utility to generate pptable.c
-# allows to do cross-compiling if neccesary.
-!ifndef HB_PPGEN_EXE
-     HB_PPGEN_EXE = $(BIN_DIR)\ppgen$(HB_EXE_EXT)
-!endif
-
+HARBOUR_EXE  = $(BIN_DIR)\harbour$(HB_EXE_EXT)
+# required (intermediate) utility
+#     to generate pptable.c
+HBPPGEN_EXE  = $(BIN_DIR)\ppgen$(HB_EXE_EXT)
 HBPP_EXE     = $(BIN_DIR)\hbpp$(HB_EXE_EXT)
 HBPPTEST_EXE = $(BIN_DIR)\hbpptest$(HB_EXE_EXT)
 HBRUN_EXE    = $(BIN_DIR)\hbrun$(HB_EXE_EXT)
@@ -209,6 +202,20 @@ HBVER_EXE    = $(BIN_DIR)\hbverfix$(HB_EXE_EXT)
 HARBOUR_DLL  = $(BIN_DIR)\harbour-$(CC_DIRNAME)$(HB_DLL_EXT)
 HBTESTDLL_EXE= $(BIN_DIR)\hbtest-dll$(HB_EXE_EXT)
 
+#**********************************************************
+#**********************************************************
+#**********************************************************
+
+# allows to do cross-compiling if neccesary.
+!ifndef HB
+HB = $(HARBOUR_EXE)
+!endif
+
+# allows to do cross-compiling if neccesary.
+!ifndef HBPPGEN
+HBPPGEN = $(HBPPGEN_EXE)
+!endif
+
 #**********************************************************
 
 #
@@ -993,11 +1000,11 @@ DISABLED_SHARED_MODULES=    \
 
 HB_BUILD_TARGETS = \
     $(COMMON_LIB)           \
-    $(HB_PPGEN_EXE)         \
+    $(HBPPGEN_EXE)          \
     $(PP_LIB)               \
     \
     $(COMPILER_LIB)         \
-    $(HB_HARBOUR_EXE)       \
+    $(HARBOUR_EXE)          \
     $(HBPP_EXE)             \
     \
     $(VM_LIB)               \
@@ -1035,3 +1042,4 @@ HB_BUILD_TARGETS = $(HB_BUILD_TARGETS) $(HARBOUR_DLL) $(HBTESTDLL_EXE)
 #**********************************************************
 #**********************************************************
 #**********************************************************
+
diff --git a/harbour/makefile.bc b/harbour/makefile.bc
index a3ccdc9789..9f3f799bb0 100644
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -164,7 +164,7 @@ ARFLAGS = /P32
 
 # General *.prg --> *.obj COMPILE rule for STATIC Libraries
 {$(ALL_SRC_DIRS)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\  $**
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\  $**
      $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)\$&.c
 
 #**********************************************************
@@ -177,7 +177,7 @@ ARFLAGS = /P32
 
 # General *.prg --> *.obj COMPILE rule for SHARED Libraries
 {$(ALL_LIB_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\  $**
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\  $**
      $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
 
 #**********************************************************
@@ -192,7 +192,7 @@ ARFLAGS = /P32
 # General *.prg --> *.obj COMPILE rules for EXECUTABLES,
 # which use Harbour SHARED Library compiled as DLL
 {$(ALL_EXE_SRC_DIRS)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\  $**
+     $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\  $**
      $(CC) $(CEXEFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
 
 #**********************************************************
@@ -226,7 +226,7 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS)
 #
 
 BasicLibs : $(COMMON_LIB) $(COMPILER_LIB) $(PP_LIB)
-BasicExes : $(HB_HARBOUR_EXE)
+BasicExes : $(HARBOUR_EXE)
 StdLibs   : $(STANDARD_STATIC_HBLIBS)
 
 #**********************************************************
@@ -469,12 +469,12 @@ $(GTGUI_LIB)    : $(GTGUI_LIB_OBJS)
 #
 # HARBOUR build rule
 #
-$(HB_HARBOUR_EXE) :: BasicLibs
-$(HB_HARBOUR_EXE) :: $(HARBOUR_EXE_OBJS)
-     IF EXIST "$(HB_HARBOUR_EXE)" $(DEL) "$(HB_HARBOUR_EXE)" > NUL
+$(HARBOUR_EXE) :: BasicLibs
+$(HARBOUR_EXE) :: $(HARBOUR_EXE_OBJS)
+     IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > NUL
      $(CC) @&&!
 $(CFLAGS)
--e$(HB_HARBOUR_EXE)
+-e$(HARBOUR_EXE)
 $(**: = ^
 )
 $(COMPILER_LIB)
@@ -485,12 +485,12 @@ $(PP_LIB)
 #
 # HBPPGEN build rule
 #
-$(HB_PPGEN_EXE) :: $(COMMON_LIB)
-$(HB_PPGEN_EXE) :: $(HBPPGEN_EXE_OBJS)
-     IF EXIST "$(HB_PPGEN_EXE)" $(DEL) "$(HB_PPGEN_EXE)" > NUL
+$(HBPPGEN_EXE) :: $(COMMON_LIB)
+$(HBPPGEN_EXE) :: $(HBPPGEN_EXE_OBJS)
+     IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > NUL
      $(CC) @&&!
 $(CFLAGS)
--e$(HB_PPGEN_EXE)
+-e$(HBPPGEN_EXE)
 $(**: = ^
 )
 $(COMMON_LIB)
@@ -617,7 +617,7 @@ c0x32.obj $**, $@,,$(HARBOUR_DLL:.dll=.lib) cw32mt$(RTLIBSUFFIX).lib import32.li
 !
 #----------------------------------------------------------
 #$(DLL_OBJ_DIR)\hbtest.obj : $(HBTEST_DIR)\hbtest.prg
-#    $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\  $**
+#    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\  $**
 #    $(CC) $(CLIBFLAGSDLL) -o$@ $(DLL_OBJ_DIR)\$&.c
 #----------------------------------------------------------
 $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
@@ -634,9 +634,9 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
 # built at the initial phase of build process
 $(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c
 $(PP_DIR)\pptable.c    : include\hbstdgen.ch
-     echo $(HB_PPGEN_EXE)
+     echo $(HBPPGEN)
      IF EXIST "$(PP_DIR)\pptable.c" $(DEL) "$(PP_DIR)\pptable.c" > nul
-     $(HB_PPGEN_EXE) include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q
+     $(HBPPGEN) include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q
 
 #**********************************************************
 
@@ -727,4 +727,3 @@ $(DLL_OBJ_DIR)\harbourl.obj : $(DLL_OBJ_DIR)\harbourl.c
      $(DEL) $(DLL_OBJ_DIR)\unistd.h
 
 #**********************************************************
-
diff --git a/harbour/makefile.vc b/harbour/makefile.vc
index bd75c85750..6e8b926f54 100644
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -276,131 +276,131 @@ LDFLAGSDLL     = /DEBUG $(LDFLAGSDLL)
 # General *.prg --> *.obj COMPILE rules for STATIC Libraries
 #*******************************************************
 {$(OBJ_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(COMMON_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PP_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(VM_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RTL_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(MACRO_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DEBUG_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(LANG_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(CODEPAGE_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PCRE_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RDD_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(NULSYS_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFNTX_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFCDX_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFFPT_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBSIX_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HSX_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(USRRDD_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTCGI_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTPCA_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTSTD_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWIN_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWVT_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTGUI_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HARBOUR_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBPP_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBPPTEST_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) $< -o$(OBJ_DIR)\\
+     $(HB) $(HARBOURFLAGS) $< -o$(OBJ_DIR)\\
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBRUN_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBTEST_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBDOC_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBMAKE_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBVER_DIR)}.prg{$(OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGS) -Fo$(OBJ_DIR)\ $(OBJ_DIR)\$(*B).c
 #*******************************************************
 
@@ -519,99 +519,99 @@ LDFLAGSDLL     = /DEBUG $(LDFLAGSDLL)
 # General *.prg --> *.obj COMPILE rules for SHARED Libraries
 #*******************************************************
 {$(DLL_OBJ_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(COMMON_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PP_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(VM_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RTL_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(MACRO_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DEBUG_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(LANG_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(PCRE_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(CODEPAGE_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(RDD_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(NULSYS_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFNTX_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFCDX_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(DBFFPT_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBSIX_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HSX_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(USRRDD_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTCGI_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTPCA_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTSTD_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWIN_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTWVT_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(GTGUI_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGSDLL) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CLIBFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 
@@ -620,35 +620,35 @@ LDFLAGSDLL     = /DEBUG $(LDFLAGSDLL)
 # which use Harbour SHARED Library compiled as DLL
 #*******************************************************
 #{$(HARBOUR_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-#    $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+#    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
 #    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 #{$(HBPP_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-#    $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+#    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
 #    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBPPTEST_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBRUN_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBTEST_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBDOC_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBMAKE_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #*******************************************************
 {$(HBVER_DIR)}.prg{$(DLL_OBJ_DIR)}.obj:
-     $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
+     $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\ $<
      $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 
 #**********************************************************
@@ -679,7 +679,7 @@ all : $(HB_DEST_DIRS) $(HB_BUILD_TARGETS)
 #
 
 #BasicLibs : $(COMMON_LIB) $(COMPILER_LIB) $(PP_LIB)
-#BasicExes : $(HB_HARBOUR_EXE)
+#BasicExes : $(HARBOUR_EXE)
 #StdLibs   : $(STANDARD_STATIC_HBLIBS)
 
 #**********************************************************
@@ -821,11 +821,11 @@ $(GTGUI_LIB)    : $(GTGUI_LIB_OBJS)
 #
 # HARBOUR build rule
 #
-$(HB_HARBOUR_EXE) : $(HARBOUR_EXE_OBJS)
-     IF EXIST "$(HB_HARBOUR_EXE)" $(DEL) "$(HB_HARBOUR_EXE)" > nul
+$(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS)
+     IF EXIST "$(HARBOUR_EXE)" $(DEL) "$(HARBOUR_EXE)" > nul
      $(LINKER) @<<
 $(LDFLAGS)
-/OUT:$(HB_HARBOUR_EXE)
+/OUT:$(HARBOUR_EXE)
 $(**: = ^
 )
 $(COMMON_LIB)
@@ -836,11 +836,11 @@ $(PP_LIB)
 #
 # HBPPGEN build rule
 #
-$(HB_PPGEN_EXE) : $(HBPPGEN_EXE_OBJS)
-     IF EXIST "$(HB_PPGEN_EXE)" $(DEL) "$(HB_PPGEN_EXE)" > nul
+$(HBPPGEN_EXE) : $(HBPPGEN_EXE_OBJS)
+     IF EXIST "$(HBPPGEN_EXE)" $(DEL) "$(HBPPGEN_EXE)" > nul
      $(LINKER) @<<
 $(LDFLAGS)
-/OUT:$(HB_PPGEN_EXE)
+/OUT:$(HBPPGEN_EXE)
 $(**: = ^
 )
 $(COMMON_LIB)
@@ -948,8 +948,8 @@ user32.lib winspool.lib
 # DLL Targets
 #
 #**********************************************************
-#$(HARBOUR_DLL) : $(HB_HARBOUR_EXE) $(DLL_OBJS)
-$(HARBOUR_DLL) : $(HB_HARBOUR_EXE) $(DLL_OBJS)
+#$(HARBOUR_DLL) : $(HARBOUR_EXE) $(DLL_OBJS)
+$(HARBOUR_DLL) : $(HB) $(DLL_OBJS)
      $(LINKER) @<<
 $(LDFLAGSDLL) /OUT:$(@)
 /IMPLIB:$(@:.dll=.lib)
@@ -973,7 +973,7 @@ $(HARBOUR_DLL:.dll=.lib)
 <<$(KEEPSTATE)
 #----------------------------------------------------------
 #$(DLL_OBJ_DIR)\hbtest.obj : $(HBTEST_DIR)\hbtest.prg
-#    $(HB_HARBOUR_EXE) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\  $**
+#    $(HB) $(HARBOURFLAGS) -o$(DLL_OBJ_DIR)\  $**
 #    $(CC) $(CEXEFLAGSDLL) -Fo$(DLL_OBJ_DIR)\ $(DLL_OBJ_DIR)\$(*B).c
 #----------------------------------------------------------
 $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
@@ -991,7 +991,7 @@ $(DLL_OBJ_DIR)\mainstd.obj : $(VM_DIR)\mainstd.c
 $(OBJ_DIR)\pptable.obj : $(PP_DIR)\pptable.c
 $(PP_DIR)\pptable.c    : include\hbstdgen.ch
      IF EXIST "$(PP_DIR)\pptable.c" $(DEL) "$(PP_DIR)\pptable.c" > nul
-     $(HB_PPGEN_EXE) include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q
+     $(HBPPGEN) include/hbstdgen.ch -o$(PP_DIR)/pptable.c -q
 
 #**********************************************************