diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d3892584c7..29de8429ce 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-09 19:36 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbqt/Makefile
+  * contrib/hbqt/hbqt.ch
+  - contrib/hbqt/hbqt_misc.prg
+  * contrib/hbxbp/xbp.ch
+  * contrib/hbxbp/xbpgeneric.prg
+    + Replaced local trace solution with HB_TRACESTRING().
+
 2009-12-09 19:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbtrace.c
     + Added support for HB_TR_WINOUT envvar (on Windows platform-only)
diff --git a/harbour/contrib/hbqt/Makefile b/harbour/contrib/hbqt/Makefile
index 12051ca701..ab8d4b884a 100644
--- a/harbour/contrib/hbqt/Makefile
+++ b/harbour/contrib/hbqt/Makefile
@@ -11,9 +11,6 @@ LIBNAME := hbqt
 PRG_HEADERS := \
    hbqt.ch \
 
-PRG_SOURCES := \
-   hbqt_misc.prg \
-
 include $(TOP)$(ROOT)contrib/hbqt/detect.mk
 
 ifneq ($(HB_HAS_QT),)
diff --git a/harbour/contrib/hbqt/hbqt.ch b/harbour/contrib/hbqt/hbqt.ch
index d9e90c865d..db4c22c54f 100644
--- a/harbour/contrib/hbqt/hbqt.ch
+++ b/harbour/contrib/hbqt/hbqt.ch
@@ -68,7 +68,7 @@
 #ifndef _HBQT_CH
 
 #if defined( __HB_DEBUG__ )
-   #xtranslate HBQT_DEBUG( [<x,...>] ) => _HBQT_DEBUG( <x> )
+   #xtranslate HBQT_DEBUG( [<x,...>] ) => hb_TraceString( <x> )
 #else
    #xtranslate HBQT_DEBUG( [<x,...>] ) => iif( .T.,, )
 #endif
diff --git a/harbour/contrib/hbqt/hbqt_misc.prg b/harbour/contrib/hbqt/hbqt_misc.prg
deleted file mode 100644
index ff0dd59796..0000000000
--- a/harbour/contrib/hbqt/hbqt_misc.prg
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * Harbour Project source code:
- * Generic support functions
- *
- * Copyright 2009 Viktor Szakats (harbour.01 syenar.hu)
- * www - http://www.harbour-project.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
- *
- * As a special exception, the Harbour Project gives permission for
- * additional uses of the text contained in its release of Harbour.
- *
- * The exception is that, if you link the Harbour libraries with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the Harbour library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the Harbour
- * Project under the name Harbour.  If you copy code from other
- * Harbour Project or Free Software Foundation releases into a copy of
- * Harbour, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for Harbour, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- *
- */
-
-#include "common.ch"
-
-#if defined( __HB_DEBUG__ )
-
-PROCEDURE _HBQT_DEBUG( ... )
-   LOCAL cString := ""
-
-   AEval( hb_AParams(), {| x | cString += iif( ISARRAY( x ), "[" + hb_ntos( Len( x ) ) + "]", hb_ValToStr( x ) ) + "   " } )
-
-   #if defined( __PLATFORM__WINDOWS ) .AND. defined( __HB_WINDEBUG__ )
-      wapi_OutputDebugString( cString )
-   #else
-      hb_TraceString( cString )
-   #endif
-
-   RETURN
-
-#endif
diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch
index de7afb76cc..f3ab8a75a2 100644
--- a/harbour/contrib/hbxbp/xbp.ch
+++ b/harbour/contrib/hbxbp/xbp.ch
@@ -5,7 +5,7 @@
 #ifndef _XBP_CH
 
 #if defined( __HB_DEBUG__ )
-   #xtranslate HBXBP_DEBUG( [<x,...>] ) => _HBXBP_DEBUG( <x> )
+   #xtranslate HBXBP_DEBUG( [<x,...>] ) => hb_TraceString( <x> )
 #else
    #xtranslate HBXBP_DEBUG( [<x,...>] ) => iif( .T.,, )
 #endif
diff --git a/harbour/contrib/hbxbp/xbpgeneric.prg b/harbour/contrib/hbxbp/xbpgeneric.prg
index 8ada536f1e..a58dcaf42d 100644
--- a/harbour/contrib/hbxbp/xbpgeneric.prg
+++ b/harbour/contrib/hbxbp/xbpgeneric.prg
@@ -368,22 +368,3 @@ FUNCTION hbxbp_ConvertAFactFromXBP( cMode, xValue )
    RETURN xValue
 
 /*----------------------------------------------------------------------*/
-
-#if defined( __HB_DEBUG__ )
-
-PROCEDURE _HBXBP_DEBUG( ... )
-   LOCAL cString := ""
-
-   AEval( hb_AParams(), {| x | cString += iif( ISARRAY( x ), "[" + hb_ntos( Len( x ) ) + "]", hb_ValToStr( x ) ) + "   " } )
-
-   #if defined( __PLATFORM__WINDOWS ) .AND. defined( __HB_WINDEBUG__ )
-      wapi_OutputDebugString( cString )
-   #else
-      hb_TraceString( cString )
-   #endif
-
-   RETURN
-
-#endif
-
-/*----------------------------------------------------------------------*/