diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f7539d45bf..fc5f590641 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,26 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-07-09 16:22 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/gtsys.c
+    ! Added hack to fix setting default GT in bcc C++ builds.
+      (please replace this with more elegant solution)
+
+  * src/rtl/gtwin/gtwin.c
+    * static var prefixed with 's_'
+
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/hbqtcore.hbp
+  * contrib/hbqt/qtwebkit/hbqtwebkit.hbp
+  * contrib/hbqt/hbqscintilla/hbqscintilla.hbp
+  * contrib/hbqt/hbqtnetwork.hbp
+  * contrib/hbqt/qtdesigner/hbqtdesigner.hbp
+  * contrib/hbqt/hbqt.hbp
+  * contrib/hbqt/hbqtgui.hbp
+    - -hblib option moved from common part to each .hbp.
+      It's cleaner and more generic this way plus it helps
+      tools (make.hbs and hbide) to decide about project type.
+
 2010-07-09 15:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/compiler/genc.c
   * src/compiler/gencc.c
diff --git a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
index 9853c8ad50..2919a0d8f4 100644
--- a/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
+++ b/harbour/contrib/hbqt/hbqscintilla/hbqscintilla.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-hblib
+
 ../hbqt_common.hbm
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/hbqt.hbp b/harbour/contrib/hbqt/hbqt.hbp
index 7c46519995..0644d32a0d 100644
--- a/harbour/contrib/hbqt/hbqt.hbp
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-hblib
+
 hbqt_common.hbm
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/hbqt_common.hbm b/harbour/contrib/hbqt/hbqt_common.hbm
index 9c9b7067a1..58af226298 100644
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -2,7 +2,6 @@
 # $Id$
 #
 
--hblib
 -inc
 
 -w3 -es2
diff --git a/harbour/contrib/hbqt/hbqtcore.hbp b/harbour/contrib/hbqt/hbqtcore.hbp
index 575d3d06e3..f1834f2317 100644
--- a/harbour/contrib/hbqt/hbqtcore.hbp
+++ b/harbour/contrib/hbqt/hbqtcore.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-hblib
+
 hbqt_common.hbm
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/hbqtgui.hbp b/harbour/contrib/hbqt/hbqtgui.hbp
index f5618ef738..7b8554c5f1 100644
--- a/harbour/contrib/hbqt/hbqtgui.hbp
+++ b/harbour/contrib/hbqt/hbqtgui.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-hblib
+
 hbqt_common.hbm
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/hbqtnetwork.hbp b/harbour/contrib/hbqt/hbqtnetwork.hbp
index 3516ab7fa8..4dca685163 100644
--- a/harbour/contrib/hbqt/hbqtnetwork.hbp
+++ b/harbour/contrib/hbqt/hbqtnetwork.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-hblib
+
 hbqt_common.hbm
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
index c5b6684bd4..7bdd2aabe4 100644
--- a/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
+++ b/harbour/contrib/hbqt/qtdesigner/hbqtdesigner.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-hblib
+
 ../hbqt_common.hbm
 
 -o${hb_name}
diff --git a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
index a098eacb2c..3c17267755 100644
--- a/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
+++ b/harbour/contrib/hbqt/qtwebkit/hbqtwebkit.hbp
@@ -2,6 +2,8 @@
 # $Id$
 #
 
+-hblib
+
 ../hbqt_common.hbm
 
 -o${hb_name}
diff --git a/harbour/src/rtl/gtsys.c b/harbour/src/rtl/gtsys.c
index 3ba016fdbd..23e4f967eb 100644
--- a/harbour/src/rtl/gtsys.c
+++ b/harbour/src/rtl/gtsys.c
@@ -75,4 +75,9 @@
    HB_GT_REQUEST( STD )
 #endif
 
-HB_FUNC( HB_GTSYS ) {}
+HB_FUNC( HB_GTSYS )
+{
+#if defined( HB_OS_WIN ) && defined( __BORLANDC__ ) && defined( __cplusplus )
+   hb_gt_ForceLink_HB_GT_WIN();
+#endif
+}
diff --git a/harbour/src/rtl/gtwin/gtwin.c b/harbour/src/rtl/gtwin/gtwin.c
index bf0cc0c802..432ed5bbd6 100644
--- a/harbour/src/rtl/gtwin/gtwin.c
+++ b/harbour/src/rtl/gtwin/gtwin.c
@@ -207,7 +207,7 @@ typedef struct _CLIPKEYCODE
 /* Keypad keys */
 
 
-static const CLIPKEYCODE stdKeyTab[ CLIP_STDKEY_COUNT ] = {
+static const CLIPKEYCODE s_stdKeyTab[ CLIP_STDKEY_COUNT ] = {
    { 32,                  0,             0,         0,             0}, /* ' ' */
    { 33,                  0,             0,         0,             0}, /* '!' */
    { 34,                  0,             0,         0,             0}, /* '"' */
@@ -1564,9 +1564,9 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
             else if( wChar >= 112 && wChar <= 123 )   /* F1-F12 VK_F1-VK_F12 */
                extKey = wChar - 112;
             else if( ch >= K_SPACE && ch <= K_CTRL_BS )
-               clipKey = &stdKeyTab[ ch - K_SPACE ];
+               clipKey = &s_stdKeyTab[ ch - K_SPACE ];
             else if( ch > 0 && ch < K_SPACE && ( dwState & ( LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED ) ) )
-               clipKey = &stdKeyTab[ ch + '@' ];
+               clipKey = &s_stdKeyTab[ ch + '@' ];
             else if( ch < 0 ) /* international keys */
                ch += 256;