diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1a744378bb..85b09e1cb7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-13 01:36 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * config/dos/owatcom.cf
+  * config/win/poccce.cf
+  * config/win/pocc64.cf
+  * config/win/owatcom.cf
+  * config/win/pocc.cf
+  * config/linux/owatcom.cf
+  * config/os2/owatcom.cf
+    ! Cleanups and fixes after yesterday's changes.
+      Turned out that CFLAGS has an important and strange
+      difference compared to CPPFLAGS: It's also passed to the
+      _linker_ :( This should be cleaned in the future.
+    ! HB_USER_LDFLAGS honored in dos/owatcom.
+
 2009-03-13 01:16 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/hbgf/hbgfwin/winapi.c
     * Formatting.
diff --git a/harbour/config/dos/owatcom.cf b/harbour/config/dos/owatcom.cf
index 5418dce3a8..1d1817a1eb 100644
--- a/harbour/config/dos/owatcom.cf
+++ b/harbour/config/dos/owatcom.cf
@@ -37,15 +37,15 @@ CPPFLAGS += -5 -fp5
 CPPFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
 endif
 
-ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -d2
-endif
-
 CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
 CPPFLAGS += -i$(HB_INC_COMPILE)
 endif
 
+ifeq ($(HB_BUILD_DEBUG),yes)
+CPPFLAGS += -d2
+endif
+
 # work arround to DOS command line size limit
 export WPP386 := $(strip $(CPPFLAGS))
 CPPFLAGS =
@@ -101,7 +101,7 @@ ifeq ($(findstring rtl,$(LIBS)),rtl)
    endif
 endif
 
-LD_RULE = $(link_exe_file)
+LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS)
 
 #Note: The empty line below HAVE TO exist!
 define lib_object
diff --git a/harbour/config/linux/owatcom.cf b/harbour/config/linux/owatcom.cf
index d7050052f1..14f7d9ac2d 100644
--- a/harbour/config/linux/owatcom.cf
+++ b/harbour/config/linux/owatcom.cf
@@ -27,15 +27,16 @@ CPPFLAGS += -5 -fp5
 CPPFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
 endif
 
-ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -d2
-endif
 
 CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
    CPPFLAGS += -i$(HB_INC_COMPILE)
 endif
 
+ifeq ($(HB_BUILD_DEBUG),yes)
+CPPFLAGS += -d2
+endif
+
 empty:=
 space:= $(empty) $(empty)
 comma:= ,
diff --git a/harbour/config/os2/owatcom.cf b/harbour/config/os2/owatcom.cf
index 4107f2e553..fe51b156f7 100644
--- a/harbour/config/os2/owatcom.cf
+++ b/harbour/config/os2/owatcom.cf
@@ -15,24 +15,25 @@ CC = wpp386
 CC_IN =
 CC_OUT = -fo=
 
-#CFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2
-CFLAGS = -w2 -zq -bt=OS2
+#CPPFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=OS2
+CPPFLAGS = -w2 -zq -bt=OS2
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
-CFLAGS += -5 -fp5
+CPPFLAGS += -5 -fp5
+
 # optimization flags
 # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
-CFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
+CPPFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
 endif
 
-CFLAGS += -i. -i$(TOP)$(ROOT)include
+CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
-CFLAGS += -i$(HB_INC_COMPILE)
+CPPFLAGS += -i$(HB_INC_COMPILE)
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -d2
+CPPFLAGS += -d2
 endif
 
 # Note: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/config/win/owatcom.cf b/harbour/config/win/owatcom.cf
index 1099bb8a44..2c9c412ef0 100644
--- a/harbour/config/win/owatcom.cf
+++ b/harbour/config/win/owatcom.cf
@@ -15,24 +15,24 @@ CC = wpp386
 CC_IN =
 CC_OUT = -fo=
 
-#CFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT
-CFLAGS = -w2 -zq -bt=NT
+#CPPFLAGS = -j -w3 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT
+CPPFLAGS = -w2 -zq -bt=NT
 
 ifneq ($(HB_BUILD_OPTIM),no)
 # architecture flags
-CFLAGS += -5 -fp5
+CPPFLAGS += -5 -fp5
 # optimization flags
 # don't enable -ol optimization in OpenWatcom 1.1 - gives buggy code
-CFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
+CPPFLAGS += -onaehtzr -oi+ -ei -zp8 -s -zt0
 endif
 
-CFLAGS += -i. -i$(TOP)$(ROOT)include
+CPPFLAGS += -i. -i$(TOP)$(ROOT)include
 ifneq ($(HB_LIB_COMPILE),)
-CFLAGS += -i$(HB_INC_COMPILE)
+CPPFLAGS += -i$(HB_INC_COMPILE)
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -d2
+CPPFLAGS += -d2
 endif
 
 # Note: The empty line directly before 'endef' HAVE TO exist!
diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf
index b0bfa52afa..359d36a26f 100644
--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -14,23 +14,25 @@ LIB_EXT = .lib
 CC = pocc.exe
 CC_IN = -c
 CC_OUT = -Fo
-CFLAGS = -I.
+CPPFLAGS = -I.
 
-CFLAGS += -Ze -Go -MT
+CPPFLAGS += -Ze -Go -MT
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -Ot
+CPPFLAGS += -Ot
 # -Ox: can cause GPF in 4.50/5.00, so it's disabled.
 endif
 
 ifneq ($(HB_INC_COMPILE),)
-CFLAGS += -I$(HB_INC_COMPILE)
+CPPFLAGS += -I$(HB_INC_COMPILE)
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -Zi
+CPPFLAGS += -Zi
 endif
 
+CFLAGS =
+
 LD = polink.exe
 LD_OUT = -OUT:
 
diff --git a/harbour/config/win/pocc64.cf b/harbour/config/win/pocc64.cf
index 966f2e8e12..a97292c4d1 100644
--- a/harbour/config/win/pocc64.cf
+++ b/harbour/config/win/pocc64.cf
@@ -4,4 +4,4 @@
 
 include $(TOP)$(ROOT)config/$(HB_ARCHITECTURE)/pocc.cf
 
-CFLAGS += /Tamd64-coff
+CPPFLAGS += /Tamd64-coff
diff --git a/harbour/config/win/poccce.cf b/harbour/config/win/poccce.cf
index 1476db6bd7..907a7f88e7 100644
--- a/harbour/config/win/poccce.cf
+++ b/harbour/config/win/poccce.cf
@@ -18,26 +18,28 @@ HB_GCMODE=0
 CC = pocc.exe
 CC_IN = -c
 CC_OUT = -Fo
-CFLAGS = -I.
+CPPFLAGS = -I.
 
-CFLAGS += -Ze -Go
+CPPFLAGS += -Ze -Go
 
 ifneq ($(HB_BUILD_OPTIM),no)
-CFLAGS += -Ot
+CPPFLAGS += -Ot
 # -Ox: can cause GPF in 4.50/5.00, so it's disabled.
 endif
 
 # For Pocket PC and ARM processors (including XScale)
-CFLAGS += -Tarm-coff -D_WINCE -DUNICODE -DHB_NO_WIN_CONSOLE
+CPPFLAGS += -Tarm-coff -D_WINCE -DUNICODE -DHB_NO_WIN_CONSOLE
 
 ifneq ($(HB_INC_COMPILE),)
-CFLAGS += -I$(HB_INC_COMPILE)
+CPPFLAGS += -I$(HB_INC_COMPILE)
 endif
 
 ifeq ($(HB_BUILD_DEBUG),yes)
-CFLAGS += -Zi
+CPPFLAGS += -Zi
 endif
 
+CFLAGS =
+
 LD = polink.exe
 LD_OUT = -OUT: