diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d9078470fe..6bf9eef724 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-15 11:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/hbqt.hbc
+  * contrib/gtqtc/gtqtcs.hbc
+  * contrib/gtqtc/gtqtcs/Makefile
+  * contrib/gtqtc/Makefile
+  * contrib/gtqtc/gtqtc.hbc
+    * Cleanups.
+    ! Static mode fix for gtqtc.
+
+  * contrib/gtqtc/gtqtc.cpp
+    ! Deleted HB_TCHAR references in commented code.
+
 2009-12-15 11:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
     ! Fixed ChangeLog entry header of my last commit.
diff --git a/harbour/contrib/gtqtc/Makefile b/harbour/contrib/gtqtc/Makefile
index c69ffa3d95..63536ea840 100644
--- a/harbour/contrib/gtqtc/Makefile
+++ b/harbour/contrib/gtqtc/Makefile
@@ -13,7 +13,6 @@ MOC_HEADERS := \
 
 CPP_SOURCES := \
    gtqtc.cpp \
-   moc_gtqtc.cpp \
 
 PRG_HEADERS := \
    hbgtqtc.ch
diff --git a/harbour/contrib/gtqtc/gtqtc.cpp b/harbour/contrib/gtqtc/gtqtc.cpp
index 608ef0a42a..68b50059cb 100644
--- a/harbour/contrib/gtqtc/gtqtc.cpp
+++ b/harbour/contrib/gtqtc/gtqtc.cpp
@@ -540,9 +540,7 @@ static bool hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
       if( hSysMenu )
       {
          /* Create "Mark" prompt in SysMenu to allow console type copy operation */
-         LPTSTR buffer = HB_TCHAR_CONVTO( pWVT->pszSelectCopy );
-         AppendMenu( hSysMenu, MF_STRING, SYS_EV_MARK, buffer );
-         HB_TCHAR_FREE( buffer );
+         AppendMenu( hSysMenu, MF_STRING, SYS_EV_MARK, pWVT->pszSelectCopy );
 
          if( ! pWVT->bClosable )
             EnableMenuItem( hSysMenu, SC_CLOSE, MF_BYCOMMAND | MF_GRAYED );
diff --git a/harbour/contrib/gtqtc/gtqtc.hbc b/harbour/contrib/gtqtc/gtqtc.hbc
index 6e393d8d8c..8c57ff43a2 100644
--- a/harbour/contrib/gtqtc/gtqtc.hbc
+++ b/harbour/contrib/gtqtc/gtqtc.hbc
@@ -13,5 +13,3 @@ libs=QtCore4 QtGui4 QtNetwork4 QtWebKit4
 {allgcc}libs=supc++
 gui=yes
 gt=gtqtc
-# optional
-mt=yes
diff --git a/harbour/contrib/gtqtc/gtqtcs.hbc b/harbour/contrib/gtqtc/gtqtcs.hbc
index e1e1a72209..3810cb2d05 100644
--- a/harbour/contrib/gtqtc/gtqtcs.hbc
+++ b/harbour/contrib/gtqtc/gtqtcs.hbc
@@ -8,5 +8,3 @@ libs=QtCore QtGui QtNetwork QtWebKit
 {allgcc}libs=supc++
 gui=yes
 gt=gtqtcs
-# optional
-mt=yes
diff --git a/harbour/contrib/gtqtc/gtqtcs/Makefile b/harbour/contrib/gtqtc/gtqtcs/Makefile
index b791a0c0d1..7bd8b129ff 100644
--- a/harbour/contrib/gtqtc/gtqtcs/Makefile
+++ b/harbour/contrib/gtqtc/gtqtcs/Makefile
@@ -6,14 +6,17 @@ ROOT := ../../../
 
 include $(TOP)$(ROOT)config/global.mk
 
+vpath %.h ../
 vpath %.cpp ../
 vpath %.prg ../
 
 LIBNAME := gtqtcs
 
+MOC_HEADERS := \
+   gtqtc.h \
+
 CPP_SOURCES := \
    gtqtc.cpp \
-   moc_gtqtc.cpp \
 
 PRG_HEADERS := \
    hbgtqtc.ch
@@ -26,9 +29,7 @@ ifneq ($(HB_HAS_QT),)
 
    HB_CFLAGS += -DQT_NODLL
 
-moc_gtqtc.cpp : $(TOP)$(ROOT)contrib/gtqtc/gtqtc.h
-	$(MOC_BIN) $(TOP)$(ROOT)contrib/gtqtc/gtqtc.h > moc_gtqtc.cpp
-
+   include $(TOP)$(ROOT)contrib/hbqt/moc.mk
    include $(TOP)$(ROOT)config/header.mk
    include $(TOP)$(ROOT)config/lib.mk
 endif
diff --git a/harbour/contrib/hbqt/hbqt.hbc b/harbour/contrib/hbqt/hbqt.hbc
index 2a80554657..3f8005efb8 100644
--- a/harbour/contrib/hbqt/hbqt.hbc
+++ b/harbour/contrib/hbqt/hbqt.hbc
@@ -10,7 +10,7 @@ libs=hbqt
 libs=hbqtcore hbqtgui hbqtnetwork
 
 {win}libs=version shlwapi
-{allwin}libs=QtCore4 QtGui4 QtNetwork4 QtUiTools psapi
+{allwin}libs=QtCore4 QtGui4 QtNetwork4 QtUiTools
 {allwin}libs=psapi
 {linux}libs=QtCore QtGui QtNetwork QtUiTools
 {darwin}libs=/Library/Frameworks/QtCore.framework/QtCore