diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6891d1b464..38733136cc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,110 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-17 19:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/sqlite3/Makefile
+  * external/libhpdf/Makefile
+  * external/libpng/Makefile
+  * external/Makefile
+  * include/Makefile
+  * source/pp/Makefile
+  * source/hbextern/Makefile
+  * source/lang/Makefile
+  * source/vm/maindllh/Makefile
+  * source/vm/mainstd/Makefile
+  * source/vm/maindllp/Makefile
+  * source/vm/Makefile
+  * source/vm/vmmt/Makefile
+  * source/vm/mainwin/Makefile
+  * source/main/Makefile
+  * source/debug/Makefile
+  * source/common/Makefile
+  * source/nortl/Makefile
+  * source/rtl/gtdos/Makefile
+  * source/rtl/gtwin/Makefile
+  * source/rtl/gtxwc/Makefile
+  * source/rtl/gtcrs/Makefile
+  * source/rtl/gtstd/Makefile
+  * source/rtl/gttrm/Makefile
+  * source/rtl/Makefile
+  * source/rtl/gtcgi/Makefile
+  * source/rtl/gtos2/Makefile
+  * source/rtl/gtsln/Makefile
+  * source/rtl/gtpca/Makefile
+  * source/rtl/gtgui/Makefile
+  * source/rtl/gt_tpl/Makefile
+  * source/rtl/gtwvt/Makefile
+  * source/macro/Makefile
+  * source/hbpcre/Makefile
+  * source/codepage/Makefile
+  * source/rdd/dbfntx/Makefile
+  * source/rdd/nulsys/Makefile
+  * source/rdd/Makefile
+  * source/rdd/dbfnsx/Makefile
+  * source/rdd/dbfcdx/Makefile
+  * source/rdd/hsx/Makefile
+  * source/rdd/usrrdd/rdds/Makefile
+  * source/rdd/usrrdd/Makefile
+  * source/rdd/dbffpt/Makefile
+  * source/rdd/hbsix/Makefile
+  * source/hbzlib/Makefile
+  * source/compiler/Makefile
+  * source/Makefile
+  * utils/hbformat/Makefile
+  * utils/hbmk2/Makefile
+  * utils/hbtest/Makefile
+  * utils/hbi18n/Makefile
+  * utils/Makefile
+  * utils/hbrun/Makefile
+  * contrib/gtalleg/Makefile
+  * contrib/hbmysql/Makefile
+  * contrib/hbct/Makefile
+  * contrib/xhb/Makefile
+  * contrib/hbodbc/Makefile
+  * contrib/hbtpathy/Makefile
+  * contrib/hbgt/Makefile
+  * contrib/hbmzip/Makefile
+  * contrib/hbsqlit3/Makefile
+  * contrib/hbblat/Makefile
+  * contrib/hbqt/Makefile
+  * contrib/hbfbird/Makefile
+  * contrib/hbziparc/Makefile
+  * contrib/hbxbp/Makefile
+  * contrib/xpp/Makefile
+  * contrib/Makefile
+  * contrib/hbnf/Makefile
+  * contrib/hbcurl/hbcurls/Makefile
+  * contrib/hbcurl/Makefile
+  * contrib/gtqtc/Makefile
+  * contrib/rddsql/sddmy/Makefile
+  * contrib/rddsql/sddpg/Makefile
+  * contrib/rddsql/sddfb/Makefile
+  * contrib/rddsql/sddodbc/Makefile
+  * contrib/rddsql/Makefile
+  * contrib/hbhpdf/Makefile
+  * contrib/rddado/Makefile
+  * contrib/gtwvg/Makefile
+  * contrib/hbpgsql/Makefile
+  * contrib/rddads/Makefile
+  * contrib/hbclipsm/Makefile
+  * contrib/hbfimage/Makefile
+  * contrib/hbgd/Makefile
+  * contrib/hbmisc/Makefile
+  * contrib/hbtip/Makefile
+  * contrib/hbwin/Makefile
+  * contrib/hbbmcdx/Makefile
+  * contrib/hbvpdf/Makefile
+  * contrib/hbssl/Makefile
+  * contrib/hbbtree/Makefile
+  * tests/bldtest/Makefile
+  * doc/en-EN/Makefile
+  * doc/Makefile
+  * Makefile
+    * Renaming .cf files to .mk.
+      Pass 3. Changing .cf references to .mk ones outside config.
+      SVN is in working state again. I'll do a final check after
+      this commit.
+
 2009-08-17 19:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/none.mk
   * config/global.mk
diff --git a/harbour/Makefile b/harbour/Makefile
index da4dae2f7f..9dfc44c632 100644
--- a/harbour/Makefile
+++ b/harbour/Makefile
@@ -44,4 +44,4 @@ ifeq ($(HB_POSTINST),)
    endif
 endif
 
-include $(ROOT)config/dir.cf
+include $(ROOT)config/dir.mk
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index abba37c8e5..371f2db1b7 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -62,7 +62,7 @@ endif
 DIRS += $(HB_CONTRIB_ADDONS)
 
 ifneq ($(DIRS),)
-include $(TOP)$(ROOT)config/dir.cf
+include $(TOP)$(ROOT)config/dir.mk
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile
index c4f0196c57..bfa0cf7752 100644
--- a/harbour/contrib/gtalleg/Makefile
+++ b/harbour/contrib/gtalleg/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtalleg
 
@@ -37,29 +37,29 @@ C_SOURCES := \
    gtalleg.c \
    ssf.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index 564b4f60ee..545f71f855 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtqtc
 
@@ -75,16 +75,16 @@ CPP_SOURCES := \
 C_HEADERS := \
    gtqtc.h \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/gtwvg/Makefile b/harbour/contrib/gtwvg/Makefile
index c469497e7f..e1e87a14ca 100644
--- a/harbour/contrib/gtwvg/Makefile
+++ b/harbour/contrib/gtwvg/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbwin
 
@@ -81,13 +81,13 @@ PRG_HEADERS := \
    wvtwin.ch \
    wvgparts.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbblat/Makefile b/harbour/contrib/hbblat/Makefile
index daeb94ccf3..fc6e8fadd8 100644
--- a/harbour/contrib/hbblat/Makefile
+++ b/harbour/contrib/hbblat/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbblat
 
@@ -19,13 +19,13 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    hbblat.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbbmcdx/Makefile b/harbour/contrib/hbbmcdx/Makefile
index 69bc5e5924..a9c711a0a5 100644
--- a/harbour/contrib/hbbmcdx/Makefile
+++ b/harbour/contrib/hbbmcdx/Makefile
@@ -10,4 +10,4 @@ C_SOURCES := \
 
 LIBNAME := hbbmcdx
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/contrib/hbbtree/Makefile b/harbour/contrib/hbbtree/Makefile
index 8cbf6d03fd..cb6913ffef 100644
--- a/harbour/contrib/hbbtree/Makefile
+++ b/harbour/contrib/hbbtree/Makefile
@@ -18,9 +18,9 @@ PRG_HEADERS := \
 
 LIBNAME := hbbtree
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/hbclipsm/Makefile b/harbour/contrib/hbclipsm/Makefile
index dfa09c0bf8..b257dd8ec3 100644
--- a/harbour/contrib/hbclipsm/Makefile
+++ b/harbour/contrib/hbclipsm/Makefile
@@ -22,9 +22,9 @@ PRG_HEADERS := \
 
 LIBNAME := hbclipsm
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/hbct/Makefile b/harbour/contrib/hbct/Makefile
index 71e7bed17b..84f83eb5b4 100644
--- a/harbour/contrib/hbct/Makefile
+++ b/harbour/contrib/hbct/Makefile
@@ -119,9 +119,9 @@ PRG_HEADERS := \
    ctextern.ch \
    ctvideo.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/hbcurl/Makefile b/harbour/contrib/hbcurl/Makefile
index 21e47df6a7..2aba129299 100644
--- a/harbour/contrib/hbcurl/Makefile
+++ b/harbour/contrib/hbcurl/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbcurl
 
@@ -33,9 +33,9 @@ C_SOURCES := \
 PRG_HEADERS := \
    hbcurl.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
@@ -49,9 +49,9 @@ ifeq ($(HB_ARCHITECTURE),wce)
 endif
 
 ifneq ($(DIRS),)
-   include $(TOP)$(ROOT)config/dir.cf
+   include $(TOP)$(ROOT)config/dir.mk
 endif
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbcurl/hbcurls/Makefile b/harbour/contrib/hbcurl/hbcurls/Makefile
index de9cbf0c50..f2f9d6168f 100644
--- a/harbour/contrib/hbcurl/hbcurls/Makefile
+++ b/harbour/contrib/hbcurl/hbcurls/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 vpath %.c ../
 
@@ -22,8 +22,8 @@ C_SOURCES := \
    hbcurl.c \
    hbcurlm.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbfbird/Makefile b/harbour/contrib/hbfbird/Makefile
index 1ba63ba54d..4ad4eb9b17 100644
--- a/harbour/contrib/hbfbird/Makefile
+++ b/harbour/contrib/hbfbird/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbfbird
 
@@ -29,14 +29,14 @@ C_SOURCES := \
 PRG_SOURCES := \
    tfirebrd.prg \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile
index e9eaefc58d..f689500a81 100644
--- a/harbour/contrib/hbfimage/Makefile
+++ b/harbour/contrib/hbfimage/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbfimage
 
@@ -38,22 +38,22 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    freeimage.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbgd/Makefile b/harbour/contrib/hbgd/Makefile
index e22222dca1..8691eec40a 100644
--- a/harbour/contrib/hbgd/Makefile
+++ b/harbour/contrib/hbgd/Makefile
@@ -10,7 +10,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbgd
 
@@ -40,13 +40,13 @@ PRG_SOURCES := \
    gdimage.prg \
    gdbarcod.prg \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbgt/Makefile b/harbour/contrib/hbgt/Makefile
index dfd45e4f5b..673d88e36c 100644
--- a/harbour/contrib/hbgt/Makefile
+++ b/harbour/contrib/hbgt/Makefile
@@ -25,4 +25,4 @@ C_SOURCES := \
 
 LIBNAME := hbgt
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/contrib/hbhpdf/Makefile b/harbour/contrib/hbhpdf/Makefile
index 9fa8dcb77d..52de9ae05c 100644
--- a/harbour/contrib/hbhpdf/Makefile
+++ b/harbour/contrib/hbhpdf/Makefile
@@ -4,7 +4,7 @@
 
 ROOT = ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbhpdf
 
@@ -26,13 +26,13 @@ C_SOURCES := \
 PRG_HEADERS := \
    harupdf.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbmisc/Makefile b/harbour/contrib/hbmisc/Makefile
index 2ad8e5c9fe..2f25280e73 100644
--- a/harbour/contrib/hbmisc/Makefile
+++ b/harbour/contrib/hbmisc/Makefile
@@ -22,4 +22,4 @@ PRG_SOURCES := \
    stringp.prg \
    twirler.prg \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/contrib/hbmysql/Makefile b/harbour/contrib/hbmysql/Makefile
index 3ba92b4a10..66c924db34 100644
--- a/harbour/contrib/hbmysql/Makefile
+++ b/harbour/contrib/hbmysql/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbmysql
 
@@ -31,13 +31,13 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    mysql.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbmzip/Makefile b/harbour/contrib/hbmzip/Makefile
index ceb5c47e90..9aff903f44 100644
--- a/harbour/contrib/hbmzip/Makefile
+++ b/harbour/contrib/hbmzip/Makefile
@@ -15,9 +15,9 @@ C_SOURCES := \
 PRG_HEADERS := \
    hbmzip.ch
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/hbnf/Makefile b/harbour/contrib/hbnf/Makefile
index 2d3a2ad858..736103f3cc 100644
--- a/harbour/contrib/hbnf/Makefile
+++ b/harbour/contrib/hbnf/Makefile
@@ -152,9 +152,9 @@ BAD_PRG_SOURCES := \
 PRG_HEADERS := \
    ftmenuto.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile
index 7b8ec8ab72..fda443de51 100644
--- a/harbour/contrib/hbodbc/Makefile
+++ b/harbour/contrib/hbodbc/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbodbc
 
@@ -53,13 +53,13 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    sql.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbpgsql/Makefile b/harbour/contrib/hbpgsql/Makefile
index 4513f28316..ad85a1b66d 100644
--- a/harbour/contrib/hbpgsql/Makefile
+++ b/harbour/contrib/hbpgsql/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbpgsql
 
@@ -30,13 +30,13 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    postgres.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index 6444bde522..cdee456d4a 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbqt
 
@@ -73,16 +73,16 @@ include $(TOP)$(ROOT)contrib/hbqt/Makefile_gen
 PRG_HEADERS := \
    hbqt.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile
index 95592a72e4..8eeaa1dc53 100644
--- a/harbour/contrib/hbsqlit3/Makefile
+++ b/harbour/contrib/hbsqlit3/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbsqlit3
 
@@ -38,13 +38,13 @@ C_SOURCES := \
 PRG_HEADERS := \
    hbsqlit3.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile
index 54a7eeb2cb..b61376b6ca 100644
--- a/harbour/contrib/hbssl/Makefile
+++ b/harbour/contrib/hbssl/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbssl
 
@@ -35,13 +35,13 @@ C_SOURCES := \
 PRG_HEADERS := \
    hbssl.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile
index 46f724a6fd..fa88b2a23c 100644
--- a/harbour/contrib/hbtip/Makefile
+++ b/harbour/contrib/hbtip/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbtip
 
@@ -37,9 +37,9 @@ PRG_HEADERS := \
    thtml.ch \
    tip.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 DIRS :=
 ifeq ($(HB_HAS_OPENSSL),yes)
@@ -47,12 +47,12 @@ ifeq ($(HB_HAS_OPENSSL),yes)
 endif
 
 ifneq ($(DIRS),)
-   include $(TOP)$(ROOT)config/dir.cf
+   include $(TOP)$(ROOT)config/dir.mk
 endif
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile
index 51d2f65e7f..55e1af6400 100644
--- a/harbour/contrib/hbtpathy/Makefile
+++ b/harbour/contrib/hbtpathy/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbtpathy
 
@@ -21,9 +21,9 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    telepath.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/hbvpdf/Makefile b/harbour/contrib/hbvpdf/Makefile
index f5e5c9c44b..0c5190f81f 100644
--- a/harbour/contrib/hbvpdf/Makefile
+++ b/harbour/contrib/hbvpdf/Makefile
@@ -14,9 +14,9 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    hbvpdf.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile
index 9c8afb1d77..178d3dd684 100644
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := hbwin
 
@@ -57,13 +57,13 @@ C_HEADERS := \
 PRG_HEADERS := \
    hbwin.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbxbp/Makefile b/harbour/contrib/hbxbp/Makefile
index 3843a3c66d..48a98f1faf 100644
--- a/harbour/contrib/hbxbp/Makefile
+++ b/harbour/contrib/hbxbp/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbqt
 
@@ -80,13 +80,13 @@ PRG_HEADERS := \
    appevent.ch \
    gra.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/hbziparc/Makefile b/harbour/contrib/hbziparc/Makefile
index 0dc77dfd95..28d8361058 100644
--- a/harbour/contrib/hbziparc/Makefile
+++ b/harbour/contrib/hbziparc/Makefile
@@ -9,4 +9,4 @@ LIBNAME := hbziparc
 PRG_SOURCES := \
    hbziparc.prg \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/contrib/rddado/Makefile b/harbour/contrib/rddado/Makefile
index 7684722c79..0e525e8763 100644
--- a/harbour/contrib/rddado/Makefile
+++ b/harbour/contrib/rddado/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := rddado
 
@@ -16,13 +16,13 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    adordd.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/rddads/Makefile b/harbour/contrib/rddads/Makefile
index 186373dec9..e49ffa4dbf 100644
--- a/harbour/contrib/rddads/Makefile
+++ b/harbour/contrib/rddads/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := rddads
 
@@ -34,13 +34,13 @@ PRG_HEADERS := \
    ads.ch \
    adsextrn.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/rddsql/Makefile b/harbour/contrib/rddsql/Makefile
index fe173423fe..7ec5f18142 100644
--- a/harbour/contrib/rddsql/Makefile
+++ b/harbour/contrib/rddsql/Makefile
@@ -16,5 +16,5 @@ DIRS := \
    sddfb \
    sddodbc \
 
-include $(TOP)$(ROOT)config/lib.cf
-include $(TOP)$(ROOT)config/dir.cf
+include $(TOP)$(ROOT)config/lib.mk
+include $(TOP)$(ROOT)config/dir.mk
diff --git a/harbour/contrib/rddsql/sddfb/Makefile b/harbour/contrib/rddsql/sddfb/Makefile
index 5fd92f5d04..b5410ed7ac 100644
--- a/harbour/contrib/rddsql/sddfb/Makefile
+++ b/harbour/contrib/rddsql/sddfb/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := sddfb
 
@@ -25,10 +25,10 @@ HB_CFLAGS += $(foreach d,$(HB_INC_FIREBIRD_OK),-I$(d))
 C_SOURCES := \
    fbirddd.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/rddsql/sddmy/Makefile b/harbour/contrib/rddsql/sddmy/Makefile
index f091669d7d..5cee8cbeac 100644
--- a/harbour/contrib/rddsql/sddmy/Makefile
+++ b/harbour/contrib/rddsql/sddmy/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := sddmy
 
@@ -23,7 +23,7 @@ HB_CFLAGS += $(foreach d,$(HB_INC_MYSQL_OK),-I$(d))
 C_SOURCES := \
    mysqldd.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/rddsql/sddodbc/Makefile b/harbour/contrib/rddsql/sddodbc/Makefile
index d3ac0caa0a..56836acff9 100644
--- a/harbour/contrib/rddsql/sddodbc/Makefile
+++ b/harbour/contrib/rddsql/sddodbc/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := sddodbc
 
@@ -45,8 +45,8 @@ ifneq ($(HB_WITHOUT_ODBC),yes)
 C_SOURCES := \
    odbcdd.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/rddsql/sddpg/Makefile b/harbour/contrib/rddsql/sddpg/Makefile
index 0a109c22a0..10e5ca833c 100644
--- a/harbour/contrib/rddsql/sddpg/Makefile
+++ b/harbour/contrib/rddsql/sddpg/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := sddpg
 
@@ -23,7 +23,7 @@ HB_CFLAGS += $(foreach d,$(HB_INC_PGSQL_OK),-I$(d))
 C_SOURCES := \
    pgsqldd.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/contrib/xhb/Makefile b/harbour/contrib/xhb/Makefile
index bc3c25ebde..2a25250b48 100644
--- a/harbour/contrib/xhb/Makefile
+++ b/harbour/contrib/xhb/Makefile
@@ -81,9 +81,9 @@ PRG_HEADERS := \
    hbcompat.ch \
    xhb.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/contrib/xpp/Makefile b/harbour/contrib/xpp/Makefile
index 3ab0a564d5..1fd2cdb503 100644
--- a/harbour/contrib/xpp/Makefile
+++ b/harbour/contrib/xpp/Makefile
@@ -34,9 +34,9 @@ PRG_SOURCES := \
 PRG_HEADERS := \
    xpp.ch \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
 INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 install::
 	$(INSTALL_RULE_HEADERS)
diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile
index 0d5e03812c..c5ed3625e1 100644
--- a/harbour/doc/Makefile
+++ b/harbour/doc/Makefile
@@ -36,5 +36,5 @@ DOC_FILES := \
 DIRS := \
    en-EN \
 
-include $(TOP)$(ROOT)config/doc.cf
-include $(TOP)$(ROOT)config/dir.cf
+include $(TOP)$(ROOT)config/doc.mk
+include $(TOP)$(ROOT)config/dir.mk
diff --git a/harbour/doc/en-EN/Makefile b/harbour/doc/en-EN/Makefile
index ea47c6641a..d1360c3d1c 100644
--- a/harbour/doc/en-EN/Makefile
+++ b/harbour/doc/en-EN/Makefile
@@ -71,4 +71,4 @@ DOC_FILES := \
    treport.txt \
    var.txt \
 
-include $(TOP)$(ROOT)config/doc.cf
+include $(TOP)$(ROOT)config/doc.mk
diff --git a/harbour/external/Makefile b/harbour/external/Makefile
index ffa98a5c34..1de51016ba 100644
--- a/harbour/external/Makefile
+++ b/harbour/external/Makefile
@@ -25,7 +25,7 @@ endif
 DIRS += $(HB_EXTERNAL_ADDONS)
 
 ifneq ($(DIRS),)
-include $(TOP)$(ROOT)config/dir.cf
+include $(TOP)$(ROOT)config/dir.mk
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/external/libhpdf/Makefile b/harbour/external/libhpdf/Makefile
index d58b3a0589..8bc115a3cd 100644
--- a/harbour/external/libhpdf/Makefile
+++ b/harbour/external/libhpdf/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
@@ -115,11 +115,11 @@ C_SOURCES := \
    hpdf_utils.c \
    hpdf_xref.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/external/libpng/Makefile b/harbour/external/libpng/Makefile
index 21848cdbfe..396f8e24d8 100644
--- a/harbour/external/libpng/Makefile
+++ b/harbour/external/libpng/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 HB_BUILD_WARN := no
 HB_CFLAGS += -I$(TOP)$(ROOT)source/hbzlib
@@ -57,8 +57,8 @@ C_SOURCES := \
    pngwtran.c \
    pngwutil.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile
index 7980cab350..a523d8e1e9 100644
--- a/harbour/external/sqlite3/Makefile
+++ b/harbour/external/sqlite3/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
@@ -47,8 +47,8 @@ ifeq ($(HB_WITH_SQLITE3),yes)
 C_SOURCES := \
    sqlite3.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/include/Makefile b/harbour/include/Makefile
index e0949dcf4e..31198a3af3 100644
--- a/harbour/include/Makefile
+++ b/harbour/include/Makefile
@@ -126,4 +126,4 @@ API_HEADERS := \
    rdd.api \
    vm.api \
 
-include $(TOP)$(ROOT)config/header.cf
+include $(TOP)$(ROOT)config/header.mk
diff --git a/harbour/source/Makefile b/harbour/source/Makefile
index 2986ad3fd0..7f20fda508 100644
--- a/harbour/source/Makefile
+++ b/harbour/source/Makefile
@@ -42,4 +42,4 @@ DIRS := \
 
 endif
 
-include $(ROOT)config/dir.cf
+include $(ROOT)config/dir.mk
diff --git a/harbour/source/codepage/Makefile b/harbour/source/codepage/Makefile
index 6c5a273bd3..a692e6f84c 100644
--- a/harbour/source/codepage/Makefile
+++ b/harbour/source/codepage/Makefile
@@ -140,4 +140,4 @@ C_SOURCES := \
 
 LIBNAME := hbcpage
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/common/Makefile b/harbour/source/common/Makefile
index a7a72a718d..cb8e43ec86 100644
--- a/harbour/source/common/Makefile
+++ b/harbour/source/common/Makefile
@@ -26,4 +26,4 @@ C_SOURCES := \
 
 LIBNAME := hbcommon
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/compiler/Makefile b/harbour/source/compiler/Makefile
index 04e91babff..1e37db4339 100644
--- a/harbour/source/compiler/Makefile
+++ b/harbour/source/compiler/Makefile
@@ -51,4 +51,4 @@ C_SOURCES := \
 
 LIBNAME := hbcplr
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/debug/Makefile b/harbour/source/debug/Makefile
index 8b06ba71fe..13c10428fb 100644
--- a/harbour/source/debug/Makefile
+++ b/harbour/source/debug/Makefile
@@ -24,4 +24,4 @@ PRG_SOURCES := \
 
 LIBNAME := hbdebug
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/hbextern/Makefile b/harbour/source/hbextern/Makefile
index c27291b574..e9f92aeb05 100644
--- a/harbour/source/hbextern/Makefile
+++ b/harbour/source/hbextern/Makefile
@@ -9,4 +9,4 @@ PRG_SOURCES := \
 
 LIBNAME := hbextern
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/hbpcre/Makefile b/harbour/source/hbpcre/Makefile
index 4150b0ae00..3bfd745440 100644
--- a/harbour/source/hbpcre/Makefile
+++ b/harbour/source/hbpcre/Makefile
@@ -28,4 +28,4 @@ C_SOURCES := \
 
 LIBNAME := hbpcre
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/hbzlib/Makefile b/harbour/source/hbzlib/Makefile
index 3abf4522ac..9d60e8be42 100644
--- a/harbour/source/hbzlib/Makefile
+++ b/harbour/source/hbzlib/Makefile
@@ -20,4 +20,4 @@ C_SOURCES := \
 
 LIBNAME := hbzlib
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/lang/Makefile b/harbour/source/lang/Makefile
index ce0b101120..9254e945b3 100644
--- a/harbour/source/lang/Makefile
+++ b/harbour/source/lang/Makefile
@@ -74,4 +74,4 @@ C_SOURCES := \
 
 LIBNAME := hblang
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/macro/Makefile b/harbour/source/macro/Makefile
index bef47b58ac..1707a42188 100644
--- a/harbour/source/macro/Makefile
+++ b/harbour/source/macro/Makefile
@@ -40,4 +40,4 @@ C_SOURCES := \
 
 LIBNAME := hbmacro
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/main/Makefile b/harbour/source/main/Makefile
index 36e8ca78c8..1e3d0d2e55 100644
--- a/harbour/source/main/Makefile
+++ b/harbour/source/main/Makefile
@@ -14,4 +14,4 @@ LIBS := \
    hbcommon \
    hbnortl \
 
-include $(TOP)$(ROOT)config/bin.cf
+include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/source/nortl/Makefile b/harbour/source/nortl/Makefile
index c96d3eba69..51c11573dc 100644
--- a/harbour/source/nortl/Makefile
+++ b/harbour/source/nortl/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := hbnortl
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index c232517ea8..80fe84aa73 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -17,7 +17,7 @@ LIBS := \
    hbcommon \
    hbnortl \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
@@ -39,7 +39,7 @@ ifneq ($(HB_HOST_BUILD),lib)
       INSTALL_FILES := $(BIN_DIR)/hbpp$(BIN_EXT)
       INSTALL_DIR := $(HB_BIN_INSTALL)
       HB_INSTALL_DEF := yes
-      include $(TOP)$(ROOT)config/install.cf
+      include $(TOP)$(ROOT)config/install.mk
    endif
 endif
 
diff --git a/harbour/source/rdd/Makefile b/harbour/source/rdd/Makefile
index d6b8893885..4989519b61 100644
--- a/harbour/source/rdd/Makefile
+++ b/harbour/source/rdd/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),wce)
    HB_PRGFLAGS := -gc3
@@ -55,8 +55,8 @@ PRG_SOURCES := \
 
 LIBNAME := hbrdd
 
-# The list of all valid DB drivers is defined in config/global.cf.
+# The list of all valid DB drivers is defined in config/global.mk
 DIRS = nulsys $(HB_RDD_DIRS)
 
-include $(TOP)$(ROOT)config/lib.cf
-include $(TOP)$(ROOT)config/dir.cf
+include $(TOP)$(ROOT)config/lib.mk
+include $(TOP)$(ROOT)config/dir.mk
diff --git a/harbour/source/rdd/dbfcdx/Makefile b/harbour/source/rdd/dbfcdx/Makefile
index 5eb45e69cc..7333a638ed 100644
--- a/harbour/source/rdd/dbfcdx/Makefile
+++ b/harbour/source/rdd/dbfcdx/Makefile
@@ -10,4 +10,4 @@ C_SOURCES := \
 
 LIBNAME := rddcdx
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/dbffpt/Makefile b/harbour/source/rdd/dbffpt/Makefile
index c4f9f27fd4..206cef4ffe 100644
--- a/harbour/source/rdd/dbffpt/Makefile
+++ b/harbour/source/rdd/dbffpt/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := rddfpt
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/dbfnsx/Makefile b/harbour/source/rdd/dbfnsx/Makefile
index c3e1abab41..7b4087a4af 100644
--- a/harbour/source/rdd/dbfnsx/Makefile
+++ b/harbour/source/rdd/dbfnsx/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := rddnsx
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/dbfntx/Makefile b/harbour/source/rdd/dbfntx/Makefile
index 0e043f1a25..00f5073b40 100644
--- a/harbour/source/rdd/dbfntx/Makefile
+++ b/harbour/source/rdd/dbfntx/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := rddntx
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/hbsix/Makefile b/harbour/source/rdd/hbsix/Makefile
index b3c9e5b9a8..38ab120d2f 100644
--- a/harbour/source/rdd/hbsix/Makefile
+++ b/harbour/source/rdd/hbsix/Makefile
@@ -22,4 +22,4 @@ PRG_SOURCES := \
 
 LIBNAME := hbsix
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/hsx/Makefile b/harbour/source/rdd/hsx/Makefile
index dc7743d545..c19ec1d646 100644
--- a/harbour/source/rdd/hsx/Makefile
+++ b/harbour/source/rdd/hsx/Makefile
@@ -10,4 +10,4 @@ C_SOURCES := \
 
 LIBNAME := hbhsx
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/nulsys/Makefile b/harbour/source/rdd/nulsys/Makefile
index 98e8ece326..2696272122 100644
--- a/harbour/source/rdd/nulsys/Makefile
+++ b/harbour/source/rdd/nulsys/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := hbnulrdd
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/usrrdd/Makefile b/harbour/source/rdd/usrrdd/Makefile
index 9e55a3c622..4a162d5780 100644
--- a/harbour/source/rdd/usrrdd/Makefile
+++ b/harbour/source/rdd/usrrdd/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := hbusrrdd
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rdd/usrrdd/rdds/Makefile b/harbour/source/rdd/usrrdd/rdds/Makefile
index 5af0dd7640..de02cba6a8 100644
--- a/harbour/source/rdd/usrrdd/rdds/Makefile
+++ b/harbour/source/rdd/usrrdd/rdds/Makefile
@@ -16,4 +16,4 @@ PRG_SOURCES := \
 
 LIBNAME := hbuddall
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 9d0847116e..024fb3dbb9 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifneq ($(HB_ARCHITECTURE),wce)
    HB_PRGFLAGS := -gc3
@@ -280,5 +280,5 @@ DIRS := \
    gtwvt \
    gtxwc \
 
-include $(TOP)$(ROOT)config/lib.cf
-include $(TOP)$(ROOT)config/dir.cf
+include $(TOP)$(ROOT)config/lib.mk
+include $(TOP)$(ROOT)config/dir.mk
diff --git a/harbour/source/rtl/gt_tpl/Makefile b/harbour/source/rtl/gt_tpl/Makefile
index d18940cab3..a8476f6cbf 100644
--- a/harbour/source/rtl/gt_tpl/Makefile
+++ b/harbour/source/rtl/gt_tpl/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := gt_tpl
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rtl/gtcgi/Makefile b/harbour/source/rtl/gtcgi/Makefile
index 621fa2669d..5494c41c90 100644
--- a/harbour/source/rtl/gtcgi/Makefile
+++ b/harbour/source/rtl/gtcgi/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := gtcgi
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rtl/gtcrs/Makefile b/harbour/source/rtl/gtcrs/Makefile
index 94bec65ce1..25382df852 100644
--- a/harbour/source/rtl/gtcrs/Makefile
+++ b/harbour/source/rtl/gtcrs/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtcrs
 
@@ -53,8 +53,8 @@ endif
 
 HB_CFLAGS += $(foreach d,$(HB_INC_CURSES_OK),-I$(d))
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtdos/Makefile b/harbour/source/rtl/gtdos/Makefile
index 9758b7094c..279dcf244f 100644
--- a/harbour/source/rtl/gtdos/Makefile
+++ b/harbour/source/rtl/gtdos/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtdos
 
@@ -13,8 +13,8 @@ ifeq ($(HB_ARCHITECTURE),dos)
 C_SOURCES := \
    gtdos.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtgui/Makefile b/harbour/source/rtl/gtgui/Makefile
index 6153dc1df9..f6fbc351b4 100644
--- a/harbour/source/rtl/gtgui/Makefile
+++ b/harbour/source/rtl/gtgui/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtgui
 
@@ -21,8 +21,8 @@ ifeq ($(HB_WITH_GTGUI),yes)
 C_SOURCES := \
    gtgui.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtos2/Makefile b/harbour/source/rtl/gtos2/Makefile
index 7b2a82abca..1fe685b50d 100644
--- a/harbour/source/rtl/gtos2/Makefile
+++ b/harbour/source/rtl/gtos2/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtos2
 
@@ -13,8 +13,8 @@ ifeq ($(HB_ARCHITECTURE),os2)
 C_SOURCES := \
    gtos2.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtpca/Makefile b/harbour/source/rtl/gtpca/Makefile
index 79bfee7b93..4fe2b314b5 100644
--- a/harbour/source/rtl/gtpca/Makefile
+++ b/harbour/source/rtl/gtpca/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := gtpca
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rtl/gtsln/Makefile b/harbour/source/rtl/gtsln/Makefile
index 1ab46a564f..635df30f2b 100644
--- a/harbour/source/rtl/gtsln/Makefile
+++ b/harbour/source/rtl/gtsln/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtsln
 
@@ -45,8 +45,8 @@ endif
 
 HB_CFLAGS += $(foreach d,$(HB_INC_SLANG_OK),-I$(d))
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtstd/Makefile b/harbour/source/rtl/gtstd/Makefile
index cd0517916c..82632443e3 100644
--- a/harbour/source/rtl/gtstd/Makefile
+++ b/harbour/source/rtl/gtstd/Makefile
@@ -9,4 +9,4 @@ C_SOURCES := \
 
 LIBNAME := gtstd
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/rtl/gttrm/Makefile b/harbour/source/rtl/gttrm/Makefile
index 4c82b939ff..ca5039a750 100644
--- a/harbour/source/rtl/gttrm/Makefile
+++ b/harbour/source/rtl/gttrm/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gttrm
 
@@ -40,8 +40,8 @@ ifeq ($(HB_GPM_MOUSE),yes)
    endif
 endif
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtwin/Makefile b/harbour/source/rtl/gtwin/Makefile
index 538aa7a781..2e72109fcb 100644
--- a/harbour/source/rtl/gtwin/Makefile
+++ b/harbour/source/rtl/gtwin/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtwin
 
@@ -13,8 +13,8 @@ ifeq ($(HB_ARCHITECTURE),win)
 C_SOURCES := \
    gtwin.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtwvt/Makefile b/harbour/source/rtl/gtwvt/Makefile
index 5251053fc7..c10f3bb25e 100644
--- a/harbour/source/rtl/gtwvt/Makefile
+++ b/harbour/source/rtl/gtwvt/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtwvt
 
@@ -21,8 +21,8 @@ ifeq ($(HB_WITH_GTWVT),yes)
 C_SOURCES := \
    gtwvt.c \
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/rtl/gtxwc/Makefile b/harbour/source/rtl/gtxwc/Makefile
index 786426f317..ca8161f3fc 100644
--- a/harbour/source/rtl/gtxwc/Makefile
+++ b/harbour/source/rtl/gtxwc/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 LIBNAME := gtxwc
 
@@ -27,8 +27,8 @@ ifneq ($(strip $(HB_INC_X11_OK)),)
 
 HB_CFLAGS += $(foreach d,$(HB_INC_X11_OK),-I$(d))
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 
 else
-include $(TOP)$(ROOT)config/none.cf
+include $(TOP)$(ROOT)config/none.mk
 endif
diff --git a/harbour/source/vm/Makefile b/harbour/source/vm/Makefile
index aa46fca27a..b227e186b3 100644
--- a/harbour/source/vm/Makefile
+++ b/harbour/source/vm/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 ifeq ($(HB_HVM_ALL),)
 
@@ -120,7 +120,7 @@ ifneq ($(HB_MT),no)
    DIRS += vmmt
 endif
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
 ifneq ($(DIRS),)
-   include $(TOP)$(ROOT)config/dir.cf
+   include $(TOP)$(ROOT)config/dir.mk
 endif
diff --git a/harbour/source/vm/maindllh/Makefile b/harbour/source/vm/maindllh/Makefile
index a2fb81cc4c..b8ccb698e6 100644
--- a/harbour/source/vm/maindllh/Makefile
+++ b/harbour/source/vm/maindllh/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 vpath %.c ../
 
@@ -16,4 +16,4 @@ LIBNAME := hbmaindllh
 # always export symbols
 HB_CFLAGS += -DHB_DYNLIB
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/vm/maindllp/Makefile b/harbour/source/vm/maindllp/Makefile
index b6399ac491..a933787301 100644
--- a/harbour/source/vm/maindllp/Makefile
+++ b/harbour/source/vm/maindllp/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 vpath %.c ../
 
@@ -16,4 +16,4 @@ LIBNAME := hbmaindllp
 # always export symbols
 HB_CFLAGS += -DHB_DYNLIB
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/vm/mainstd/Makefile b/harbour/source/vm/mainstd/Makefile
index 434aab74f0..a5f68deecf 100644
--- a/harbour/source/vm/mainstd/Makefile
+++ b/harbour/source/vm/mainstd/Makefile
@@ -11,4 +11,4 @@ C_SOURCES := \
 
 LIBNAME := hbmainstd
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/vm/mainwin/Makefile b/harbour/source/vm/mainwin/Makefile
index 748373fe31..110c0a5456 100644
--- a/harbour/source/vm/mainwin/Makefile
+++ b/harbour/source/vm/mainwin/Makefile
@@ -11,4 +11,4 @@ C_SOURCES := \
 
 LIBNAME := hbmainwin
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/source/vm/vmmt/Makefile b/harbour/source/vm/vmmt/Makefile
index ec83fc8bc5..004470cf2c 100644
--- a/harbour/source/vm/vmmt/Makefile
+++ b/harbour/source/vm/vmmt/Makefile
@@ -4,7 +4,7 @@
 
 ROOT := ../../../
 
-include $(TOP)$(ROOT)config/global.cf
+include $(TOP)$(ROOT)config/global.mk
 
 vpath %.c ../
 vpath %.prg ../
@@ -81,4 +81,4 @@ LIBNAME := hbvmmt
 
 HB_CFLAGS += -DHB_MT_VM
 
-include $(TOP)$(ROOT)config/lib.cf
+include $(TOP)$(ROOT)config/lib.mk
diff --git a/harbour/tests/bldtest/Makefile b/harbour/tests/bldtest/Makefile
index 05730cbbcf..9d5a181169 100644
--- a/harbour/tests/bldtest/Makefile
+++ b/harbour/tests/bldtest/Makefile
@@ -8,4 +8,4 @@ C_MAIN := bldtest.c
 
 LIBS :=
 
-include $(TOP)$(ROOT)config/bin.cf
+include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/Makefile b/harbour/utils/Makefile
index c01872a2f2..23952dc066 100644
--- a/harbour/utils/Makefile
+++ b/harbour/utils/Makefile
@@ -12,4 +12,4 @@ DIRS := \
    hbformat \
    $(HB_UTILS) \
 
-include $(ROOT)config/dir.cf
+include $(ROOT)config/dir.mk
diff --git a/harbour/utils/hbformat/Makefile b/harbour/utils/hbformat/Makefile
index 0b72f57132..28f2b63939 100644
--- a/harbour/utils/hbformat/Makefile
+++ b/harbour/utils/hbformat/Makefile
@@ -18,4 +18,4 @@ PRG_MAIN := hbformat.prg
 
 LIBS = $(HB_LIBS_ST_NORDD)
 
-include $(TOP)$(ROOT)config/bin.cf
+include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbi18n/Makefile b/harbour/utils/hbi18n/Makefile
index b1a567adf2..7dd4abbcf9 100644
--- a/harbour/utils/hbi18n/Makefile
+++ b/harbour/utils/hbi18n/Makefile
@@ -15,4 +15,4 @@ PRG_MAIN := hbi18n.prg
 
 LIBS = $(HB_LIBS_ST_NORDD)
 
-include $(TOP)$(ROOT)config/bin.cf
+include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbmk2/Makefile b/harbour/utils/hbmk2/Makefile
index bf03e092f1..975f3a121e 100644
--- a/harbour/utils/hbmk2/Makefile
+++ b/harbour/utils/hbmk2/Makefile
@@ -15,4 +15,4 @@ PRG_MAIN := hbmk2.prg
 
 LIBS = $(HB_LIBS_MT_NORDD)
 
-include $(TOP)$(ROOT)config/bin.cf
+include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile
index 6ed281345b..83b45cb7ca 100644
--- a/harbour/utils/hbrun/Makefile
+++ b/harbour/utils/hbrun/Makefile
@@ -15,4 +15,4 @@ PRG_MAIN := hbrun.prg
 
 LIBS = $(HB_LIBS_ST_RDD)
 
-include $(TOP)$(ROOT)config/bin.cf
+include $(TOP)$(ROOT)config/bin.mk
diff --git a/harbour/utils/hbtest/Makefile b/harbour/utils/hbtest/Makefile
index cc9c594055..dbc0f3a21b 100644
--- a/harbour/utils/hbtest/Makefile
+++ b/harbour/utils/hbtest/Makefile
@@ -30,4 +30,4 @@ PRG_MAIN := hbtest.prg
 
 LIBS = $(HB_LIBS_ST_RDD)
 
-include $(TOP)$(ROOT)config/bin.cf
+include $(TOP)$(ROOT)config/bin.mk