diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a8f78642de..bc6ebceb0d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-06-03 09:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/xhb/trpc.prg
+  * harbour/contrib/xhb/trpccli.prg
+    ! fixed xhb_StartThread() -> StartThread()
+
+  * harbour/contrib/xhb/xhbgt.c
+    ! removed unnecessary wrapper to CT3 SETLASTKEY() function
+
+  * harbour/contrib/hbnf/ftisprn.c
+    ! fixed HB_ISPRINT() -> HB_ISPRINTER()
+
+  * harbour/contrib/hbxpp/tbrowsex.prg
+    ! added missing _TBR_COORD() definition
+    ; TOFIX: this code uses _MAXFREEZE() function which do not exists so
+             it cannot be linked with any application
+
 2010-06-02 19:04 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to also recognize '#include<name>' / '#include"name"'
diff --git a/harbour/contrib/hbnf/ftisprn.c b/harbour/contrib/hbnf/ftisprn.c
index 309b28d16f..b6b2aacf12 100644
--- a/harbour/contrib/hbnf/ftisprn.c
+++ b/harbour/contrib/hbnf/ftisprn.c
@@ -143,9 +143,9 @@
 
 /* TOFIX: Has different behaviour depending on platform/parameter. [vszakats] */
 
-HB_FUNC_EXTERN( HB_ISPRINT );
+HB_FUNC_EXTERN( HB_ISPRINTER );
 
 HB_FUNC( FT_ISPRINT )
 {
-   HB_FUNC_EXEC( HB_ISPRINT )
+   HB_FUNC_EXEC( HB_ISPRINTER )
 }
diff --git a/harbour/contrib/hbxpp/tbrowsex.prg b/harbour/contrib/hbxpp/tbrowsex.prg
index cf76d285cf..970f377949 100644
--- a/harbour/contrib/hbxpp/tbrowsex.prg
+++ b/harbour/contrib/hbxpp/tbrowsex.prg
@@ -56,6 +56,8 @@
 
 #include "hbclass.ch"
 
+#define _TBR_COORD( n )       Int( n )
+
 CREATE CLASS xpp_TBrowse INHERIT TBrowse
 
 EXPORTED:
diff --git a/harbour/contrib/xhb/trpc.prg b/harbour/contrib/xhb/trpc.prg
index 58dab9e077..51a6a4b252 100644
--- a/harbour/contrib/xhb/trpc.prg
+++ b/harbour/contrib/xhb/trpc.prg
@@ -458,7 +458,7 @@ METHOD Start() CLASS tRPCServeCon
 
    HB_MutexLock( ::mtxBusy )
    IF ::thSelf == NIL
-      ::thSelf := xhb_StartThread( Self, "RUN" )
+      ::thSelf := StartThread( Self, "RUN" )
       lRet := .T.
    ENDIF
    HB_MutexUnlock( ::mtxBusy )
@@ -942,7 +942,7 @@ METHOD LaunchFunction( cFuncName, aParams, nMode, aDesc ) CLASS tRPCServeCon
    ::lCanceled := .F.
    // Set the running status
    ::nStatus := RPCS_STATUS_RUNNING
-   ::thFunction := xhb_StartThread( Self, "FunctionRunner", ;
+   ::thFunction := StartThread( Self, "FunctionRunner", ;
       cFuncName, oFunc, nMode, aParams, aDesc )
    HB_MutexUnlock( ::mtxBusy )
 
@@ -1340,10 +1340,10 @@ METHOD Start( lStartUdp ) CLASS tRPCService
       ::skUdp := hb_inetDGramBind( ::nUdpPort, ::cBindAddress )
    ENDIF
 
-   ::thAccept := xhb_StartThread( Self, "Accept" )
+   ::thAccept := StartThread( Self, "Accept" )
 
    IF lStartUdp != NIL .and. lStartUdp
-      ::thUdp := xhb_StartThread( Self, "UdpListen" )
+      ::thUdp := StartThread( Self, "UdpListen" )
    ELSE
       ::thUdp := NIL
    ENDIF
diff --git a/harbour/contrib/xhb/trpccli.prg b/harbour/contrib/xhb/trpccli.prg
index 88a15b98cb..e016019abc 100644
--- a/harbour/contrib/xhb/trpccli.prg
+++ b/harbour/contrib/xhb/trpccli.prg
@@ -321,7 +321,7 @@ METHOD StartScan()
    // in async mode, just launch the listener
    IF ::lAsyncMode
       HB_MutexLock( ::mtxBusy )
-         ::thUdpAccept := xhb_StartThread( Self, "UDPAccept" )
+         ::thUdpAccept := StartThread( Self, "UDPAccept" )
       HB_MutexUnlock( ::mtxBusy )
    ELSE
       ::UDPAccept()
@@ -632,7 +632,7 @@ METHOD Call( ... ) CLASS tRPCClient
    // in async mode, just launch the listener
       IF ::lAsyncMode
          HB_MutexLock( ::mtxBusy )
-         ::thTCPAccept := xhb_StartThread( Self, "TCPAccept" )
+         ::thTCPAccept := StartThread( Self, "TCPAccept" )
          HB_MutexUnlock( ::mtxBusy )
       ELSE
          ::TCPAccept()
diff --git a/harbour/contrib/xhb/xhbgt.c b/harbour/contrib/xhb/xhbgt.c
index 3417358ce4..621dbc0152 100644
--- a/harbour/contrib/xhb/xhbgt.c
+++ b/harbour/contrib/xhb/xhbgt.c
@@ -57,4 +57,3 @@ HB_FUNC_EXTERN( HB_GFXPRIMITIVE       ) ; HB_FUNC( GFXPRIMITIVE             ) {
 HB_FUNC_EXTERN( HB_GFXTEXT            ) ; HB_FUNC( GFXTEXT                  ) { HB_FUNC_EXEC( HB_GFXTEXT            ); }
 HB_FUNC_EXTERN( HB_GTLOCK             ) ; HB_FUNC( HBCONSOLELOCK            ) { HB_FUNC_EXEC( HB_GTLOCK             ); }
 HB_FUNC_EXTERN( HB_GTUNLOCK           ) ; HB_FUNC( HBCONSOLEUNLOCK          ) { HB_FUNC_EXEC( HB_GTUNLOCK           ); }
-HB_FUNC_EXTERN( HB_SETLASTKEY         ) ; HB_FUNC( SETLASTKEY               ) { HB_FUNC_EXEC( HB_SETLASTKEY         ); }