diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ac5298dd89..38c50dc420 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,43 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-16 09:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * config/beos/gcc.mk
+  * config/bsd/gcc.mk
+  * config/wce/mingwarm.mk
+  * config/wce/poccarm.mk
+  * config/wce/msvcarm.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/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/gcc.mk
+  * config/os2/watcom.mk
+  * config/os2/gcc.mk
+  * config/sunos/gcc.mk
+  * config/sunos/sunpro.mk
+    + Added HB_USER_LIBS support to dynamic libs.
+
+  * config/globsh.mk
+    ! Attempt to fix dynamic lib .tds deletion on clean for bcc.
+
+  * src/codepage/cpno865.c
+  * src/codepage/cphu852c.c
+  * src/codepage/cpfr850.c
+  * src/codepage/cpde850.c
+  * src/codepage/cpit850.c
+    + Marked as VERIFIED.
+
 2009-11-16 00:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed typo in generated .c stub. It could cause that 
diff --git a/harbour/config/beos/gcc.mk b/harbour/config/beos/gcc.mk
index a8860c9df3..8192a00276 100644
--- a/harbour/config/beos/gcc.mk
+++ b/harbour/config/beos/gcc.mk
@@ -49,7 +49,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) && $(ARST
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP)
 
diff --git a/harbour/config/bsd/gcc.mk b/harbour/config/bsd/gcc.mk
index fe27579a46..1f5165f5de 100644
--- a/harbour/config/bsd/gcc.mk
+++ b/harbour/config/bsd/gcc.mk
@@ -47,7 +47,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) r $(LIB_DIR)/$@ $(^F) $(ARSTRIP)
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/darwin/clang.mk b/harbour/config/darwin/clang.mk
index 78998d7a74..877edc8110 100644
--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -60,7 +60,7 @@ AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(
 DY := $(AR)
 DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 DY_RULE = $(DY) $(DFLAGS) -install_name "harbour$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR)$(DYN_EXT)
 
diff --git a/harbour/config/darwin/gcc.mk b/harbour/config/darwin/gcc.mk
index 22d3f70d5a..c6eda397c5 100644
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -60,7 +60,7 @@ AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(
 DY := $(AR)
 DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 DY_RULE = $(DY) $(DFLAGS) -install_name "harbour$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2) && $(LN) $(@F) $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR)$(DYN_EXT)
 
diff --git a/harbour/config/darwin/icc.mk b/harbour/config/darwin/icc.mk
index 9914703a02..3cec2d817d 100644
--- a/harbour/config/darwin/icc.mk
+++ b/harbour/config/darwin/icc.mk
@@ -49,7 +49,7 @@ AR_RULE = ( $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) $(
 DY := $(AR)
 DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress -single_module $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk
index a6c7d2e0c6..3d24b50cf8 100644
--- a/harbour/config/dos/djgpp.mk
+++ b/harbour/config/dos/djgpp.mk
@@ -106,7 +106,7 @@ LD_RULE = $(link_exe_file)
 #DY := $(CC)
 #DFLAGS := -Wl,-shared $(LIBPATHS)
 #DY_OUT := -o$(subst x,x, )
-#DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+#DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 #
 ## NOTE: The empty line directly before 'endef' HAVE TO exist!
 #define dyn_object
diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk
index f1872f0f34..66ec9ff1fa 100644
--- a/harbour/config/dos/watcom.mk
+++ b/harbour/config/dos/watcom.mk
@@ -77,7 +77,8 @@ endif
 DY := $(LD)
 DFLAGS := OP quiet SYS cwdllr
 DY_OUT :=
-DLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib))
+DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 DLIBS += $(foreach lib,$(SYSLIBS),$(lib))
 DLIBS := $(strip $(DLIBS))
 
diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk
index b1b07675cb..bcabeb5298 100644
--- a/harbour/config/globsh.mk
+++ b/harbour/config/globsh.mk
@@ -62,6 +62,7 @@ clean::
 	   [ "`$(ECHO) $(BIN_DIR)/*`" != "$(BIN_DIR)/*" ] || $(RDP) $(BIN_DIR); \
 	fi ; \
 	if [ -n "$(DYN_FILE)" ]; then \
+	   $(RM) $(basename $(DYN_FILE)).tds; \
 	   $(RM) $(basename $(DYN_FILE)).def; \
 	   $(RM) $(basename $(DYN_FILE)).exp; \
 	   [ "`$(ECHO) $(DYN_DIR)/*`" != "$(DYN_DIR)/*" ] || $(RDP) $(DYN_DIR); \
@@ -111,6 +112,7 @@ clean::
 	$(if $(BIN_FILE),-@if exist "$(basename $(BIN_FILE_OS)).tds" $(RM) "$(basename $(BIN_FILE_OS)).tds",)
 	$(if $(BIN_FILE),-@if exist "$(BIN_DIR_OS)" if not exist "$(BIN_DIR_OS)\*" $(RDP) "$(BIN_DIR_OS)",)
 	$(if $(DYN_FILE),-@if exist "$(DYN_FILE_OS)" $(RM) "$(DYN_FILE_OS)",)
+	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).tds" $(RM) "$(basename $(DYN_FILE_OS)).tds",)
 	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).def" $(RM) "$(basename $(DYN_FILE_OS)).def",)
 	$(if $(DYN_FILE),-@if exist "$(basename $(DYN_FILE_OS)).exp" $(RM) "$(basename $(DYN_FILE_OS)).exp",)
 	$(if $(DYN_FILE),-@if exist "$(DYN_DIR_OS)" if not exist "$(DYN_DIR_OS)\*" $(RDP) "$(DYN_DIR_OS)",)
@@ -153,6 +155,7 @@ clean::
 	$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
 	$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,)
 	$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR_OS)),)
+	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).tds,)
 	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).def,)
 	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).exp,)
 	$(if $(DYN_FILE),$(if $(wildcard $(DYN_DIR)/*.*),,-@$(RDP) $(DYN_DIR_OS)),)
@@ -195,6 +198,7 @@ clean::
 	$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
 	$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,)
 	$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR_OS)),)
+	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).tds,)
 	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).def,)
 	$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).exp,)
 	$(if $(DYN_FILE),$(if $(wildcard $(DYN_DIR)/*.*),,-@$(RDP) $(DYN_DIR_OS)),)
diff --git a/harbour/config/hpux/gcc.mk b/harbour/config/hpux/gcc.mk
index 30da577758..a3b6d88df5 100644
--- a/harbour/config/hpux/gcc.mk
+++ b/harbour/config/hpux/gcc.mk
@@ -53,7 +53,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP)
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/linux/gcc.mk b/harbour/config/linux/gcc.mk
index 126cc63111..126c5c6220 100644
--- a/harbour/config/linux/gcc.mk
+++ b/harbour/config/linux/gcc.mk
@@ -57,7 +57,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && $(LN) $(@F) $(DYN_FILE2)
 
diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk
index 32f4d1315e..5be44b5e75 100644
--- a/harbour/config/os2/gcc.mk
+++ b/harbour/config/os2/gcc.mk
@@ -116,7 +116,7 @@ ifeq ($(HB_COMPILER),gccomf)
    DFLAGS += -Zomf
 endif
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAS TO exist!
 define dyn_object
diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk
index aaf13d009e..55b28e9d48 100644
--- a/harbour/config/os2/watcom.mk
+++ b/harbour/config/os2/watcom.mk
@@ -69,7 +69,8 @@ LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 DY := $(LD)
 DFLAGS := OP quiet SYS os2v2_dll
 DY_OUT :=
-DLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+DLIBS := $(HB_USER_LIBS)
+DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/sunos/gcc.mk b/harbour/config/sunos/gcc.mk
index b6ab1b7a68..f8834271bf 100644
--- a/harbour/config/sunos/gcc.mk
+++ b/harbour/config/sunos/gcc.mk
@@ -51,7 +51,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^F) $(ARSTRIP)
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP)
 
diff --git a/harbour/config/sunos/sunpro.mk b/harbour/config/sunos/sunpro.mk
index d25d964f06..97df9cf877 100644
--- a/harbour/config/sunos/sunpro.mk
+++ b/harbour/config/sunos/sunpro.mk
@@ -77,7 +77,7 @@ ifneq ($(HB_BUILD_OPTIM),no)
    DFLAGS += -fast -xnolibmopt
 endif
 DY_OUT := -o$(subst x,x, )
-DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
 
 DY_RULE = $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP)
 
diff --git a/harbour/config/wce/mingwarm.mk b/harbour/config/wce/mingwarm.mk
index 3faec7b17a..eceb1dd0f0 100644
--- a/harbour/config/wce/mingwarm.mk
+++ b/harbour/config/wce/mingwarm.mk
@@ -57,7 +57,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/wce/msvcarm.mk b/harbour/config/wce/msvcarm.mk
index 8e6c6caf2f..33b3e4a6b4 100644
--- a/harbour/config/wce/msvcarm.mk
+++ b/harbour/config/wce/msvcarm.mk
@@ -80,7 +80,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) ||
 DY := $(LD)
 DFLAGS := -nologo -dll -subsystem:windowsce $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/wce/poccarm.mk b/harbour/config/wce/poccarm.mk
index a7f5d7c881..9fc0d25371 100644
--- a/harbour/config/wce/poccarm.mk
+++ b/harbour/config/wce/poccarm.mk
@@ -59,7 +59,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F)
 DY := $(LD)
 DFLAGS := -nologo -dll $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk
index 13f4e41c15..7a65867302 100644
--- a/harbour/config/win/bcc.mk
+++ b/harbour/config/win/bcc.mk
@@ -96,7 +96,8 @@ endif
 DY := ilink32.exe
 DFLAGS += -q -Gn -C -aa -Tpd -Gi -x
 DY_OUT :=
-DLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
+DLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib)$(LIB_EXT))
+DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib)$(LIB_EXT))
 DLIBS += $(foreach lib,$(SYSLIBS),$(lib)$(LIB_EXT))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/config/win/cygwin.mk b/harbour/config/win/cygwin.mk
index 1dde86216a..656a13ca21 100644
--- a/harbour/config/win/cygwin.mk
+++ b/harbour/config/win/cygwin.mk
@@ -56,7 +56,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/win/icc.mk b/harbour/config/win/icc.mk
index 4928bc64e5..634dff476c 100644
--- a/harbour/config/win/icc.mk
+++ b/harbour/config/win/icc.mk
@@ -55,7 +55,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) ||
 DY := $(LD)
 DFLAGS := -nologo -dll -subsystem:console $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/win/mingw.mk b/harbour/config/win/mingw.mk
index f2785e2a40..910cfd9bfa 100644
--- a/harbour/config/win/mingw.mk
+++ b/harbour/config/win/mingw.mk
@@ -66,7 +66,7 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP
 DY := $(CC)
 DFLAGS := -shared $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),-l$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/win/msvc.mk b/harbour/config/win/msvc.mk
index 0578fe6135..eb59694b60 100644
--- a/harbour/config/win/msvc.mk
+++ b/harbour/config/win/msvc.mk
@@ -74,7 +74,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -nologo -out:$(LIB_DIR)/$@ $(^F) ||
 DY := $(LD)
 DFLAGS := -nologo -dll -subsystem:console $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/win/pocc.mk b/harbour/config/win/pocc.mk
index 3d399b363e..38cee06ded 100644
--- a/harbour/config/win/pocc.mk
+++ b/harbour/config/win/pocc.mk
@@ -54,7 +54,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F)
 DY := $(LD)
 DFLAGS := -nologo -dll $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk
index 88a745af87..faf483e451 100644
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -70,7 +70,8 @@ LDLIBS += $(foreach lib,$(SYSLIBS),$(lib))
 DY := $(LD)
 DFLAGS := OP quiet SYS nt_dll
 DY_OUT :=
-DLIBS := $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
+DLIBS := $(foreach lib,$(HB_USER_LIBS),$(lib))
+DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
 DLIBS += $(foreach lib,$(SYSLIBS),$(lib))
 DLIBS := $(strip $(DLIBS))
 
diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk
index 70c401618c..ea093690b4 100644
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -57,7 +57,7 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -out:$(LIB_DIR)/$@ $(^F)
 DY := $(LD)
 DFLAGS := -nologo -dll $(LIBPATHS)
 DY_OUT := $(LD_OUT)
-DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
+DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
 ifeq ($(HB_SHELL),sh)
    DYNFIX = && mv $(DYN_DIR)/$(@:.dll=.LIB) $(LIB_DIR)/$(@:.dll=.lib) && $(RM) $(DYN_DIR)/$(@:.dll=.EXP)
diff --git a/harbour/src/codepage/cpde850.c b/harbour/src/codepage/cpde850.c
index 23c255c9bf..80fe2762a3 100644
--- a/harbour/src/codepage/cpde850.c
+++ b/harbour/src/codepage/cpde850.c
@@ -19,7 +19,7 @@
 #define HB_CP_UPPER     "AŽBCDEFGHIJKLMNO™PQRS TUšVWXYZ"
 #define HB_CP_LOWER     "a„bcdefghijklmno”pqrsátuvwxyz"
 
-#if 0 /* TOVERIFY: binary tables */
+#if 0 /* VERIFIED: 20091116 */
 
 #define HB_CP_RAW
 
diff --git a/harbour/src/codepage/cpfr850.c b/harbour/src/codepage/cpfr850.c
index 5b7d8aa9c1..2d9bf60d32 100644
--- a/harbour/src/codepage/cpfr850.c
+++ b/harbour/src/codepage/cpfr850.c
@@ -19,7 +19,7 @@
 #define HB_CP_UPPER     "AAAAABCDEEEEEFGHIIIIIJKLMNOOOOOPQRSTUUUUUVWXYZ"
 #define HB_CP_LOWER     "a …ƒ„bcde‚Šˆ‰fghiĦŒ‹jklmno˘•“”pqrstu£—–vwxyz"
 
-#if 0 /* TOVERIFY: binary tables */
+#if 0 /* VERIFIED: 20091116 */
 
 #define HB_CP_RAW
 
diff --git a/harbour/src/codepage/cphu852c.c b/harbour/src/codepage/cphu852c.c
index 59f93302b6..8ad8bdf33c 100644
--- a/harbour/src/codepage/cphu852c.c
+++ b/harbour/src/codepage/cphu852c.c
@@ -19,7 +19,7 @@
 #define HB_CP_UPPER     "AµŽBCDEFGHIÖJKLMNO•à™§ ŠPQRSTU—隘 ëVWXYZ"
 #define HB_CP_LOWER     "a  „bcde‚fghi Ħjklmno ˘” “‹pqrstu £ –ûvwxyz"
 
-#if 0 /* TOVERIFY: binary tables */
+#if 0 /* VERIFIED: 20091116 */
 
 #define HB_CP_RAW
 
diff --git a/harbour/src/codepage/cpit850.c b/harbour/src/codepage/cpit850.c
index 07fbb87b13..db66123491 100644
--- a/harbour/src/codepage/cpit850.c
+++ b/harbour/src/codepage/cpit850.c
@@ -19,7 +19,7 @@
 #define HB_CP_UPPER     "AAABCDEEFGHIIIJKLMNOOOPQRSTUUUVWXYZ"
 #define HB_CP_LOWER     "a… bcde‚ŠfghiĦjklmno•˘pqrstu—£vwxyz"
 
-#if 0 /* TOVERIFY: binary tables */
+#if 0 /* VERIFIED: 20091116 */
 
 #define HB_CP_RAW
 
diff --git a/harbour/src/codepage/cpno865.c b/harbour/src/codepage/cpno865.c
index 7534a1f5f5..58c5576eee 100644
--- a/harbour/src/codepage/cpno865.c
+++ b/harbour/src/codepage/cpno865.c
@@ -19,7 +19,7 @@
 #define HB_CP_UPPER     "ABCDEFGHIJKLMNOPQRSTUVWXYšZ’ "
 #define HB_CP_LOWER     "abcdeŠfghijklmnopqrstuvwxyz‘‚›†"
 
-#if 0 /* TOVERIFY: binary tables */
+#if 0 /* VERIFIED: 20091116 */
 
 #define HB_CP_RAW