diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7d66d98fdf..683963cc59 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,11 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-24 09:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/xhb/hbcompat.ch
+    + Added a few MT related translations.
+    * Some cleanup.
+
 2008-10-23 14:25 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * contrib/hbcurl/hbcurl.c
     ! Fixed compilation against libcurl 7.16.1.
diff --git a/harbour/contrib/xhb/hbcompat.ch b/harbour/contrib/xhb/hbcompat.ch
index e308f1119c..ca31db087e 100644
--- a/harbour/contrib/xhb/hbcompat.ch
+++ b/harbour/contrib/xhb/hbcompat.ch
@@ -64,58 +64,62 @@
       #define __PLATFORM__LINUX
    #endif
 
-   #xtranslate hb_gtSys                => gtSys
-   #xtranslate hb_gtInfo([<x,...>])    => gtInfo(<x>)
-   #xtranslate hb_gtVersion([<x>])     => hb_gt_Version(<x>)
+   #xtranslate hb_gtSys                    => gtSys
+   #xtranslate hb_gtInfo([<x,...>])        => gtInfo(<x>)
+   #xtranslate hb_gtVersion([<x>])         => hb_gt_Version(<x>)
 
-   #xtranslate hb_ScrMaxRow()          => gtInfo( HB_GTI_SCREENHEIGHT )
-   #xtranslate hb_ScrMaxCol()          => gtInfo( HB_GTI_SCREENWIDTH )
-   #xtranslate MaxRow(.T.)             => gtInfo( HB_GTI_SCREENHEIGHT )
-   #xtranslate MaxCol(.T.)             => gtInfo( HB_GTI_SCREENWIDTH )
+   #xtranslate hb_ScrMaxRow()              => gtInfo( HB_GTI_SCREENHEIGHT )
+   #xtranslate hb_ScrMaxCol()              => gtInfo( HB_GTI_SCREENWIDTH )
+   #xtranslate MaxRow(.T.)                 => gtInfo( HB_GTI_SCREENHEIGHT )
+   #xtranslate MaxCol(.T.)                 => gtInfo( HB_GTI_SCREENWIDTH )
 
-   #xtranslate hb_dbPack()             => __dbPack()
-   #xtranslate hb_dbZap()              => __dbZap()
-   #xtranslate hb_dbDrop([<x,...>])    => dbDrop(<x>)
-   #xtranslate hb_dbExists([<x,...>])  => dbExists(<x>)
-   #xtranslate hb_FieldLen([<x>])      => FieldLen(<x>)
-   #xtranslate hb_FieldDec([<x>])      => FieldDec(<x>)
-   #xtranslate hb_FieldType([<x>])     => FieldType(<x>)
+   #xtranslate hb_dbPack()                 => __dbPack()
+   #xtranslate hb_dbZap()                  => __dbZap()
+   #xtranslate hb_dbDrop([<x,...>])        => dbDrop(<x>)
+   #xtranslate hb_dbExists([<x,...>])      => dbExists(<x>)
+   #xtranslate hb_FieldLen([<x>])          => FieldLen(<x>)
+   #xtranslate hb_FieldDec([<x>])          => FieldDec(<x>)
+   #xtranslate hb_FieldType([<x>])         => FieldType(<x>)
 
-   #xtranslate hb_isregex([<x>])       => hb_isregexstring(<x>)
-   #xtranslate hb_pvalue([<x,...>])    => pvalue(<x>)
-   #xtranslate hb_methodName([<x,...>])=> methodName(<x>)
-   #xtranslate hb_libLoad([<x,...>])   => libLoad(<x>)
-   #xtranslate hb_libFree([<x,...>])   => libFree(<x>)
-   #xtranslate hb_adler32([<x,...>])   => hb_checksum(<x>)
-   #xtranslate hb_setLastKey([<x,...>])=> setLastKey(<x>)
-   #xtranslate hb_CStr([<x,...>])      => CStr(<x>)
-   #xtranslate hb_DirExists(<x>)       => IsDirectory(<x>)
-   #xtranslate hb_rddInfo([<x,...>])   => rddInfo(<x>)
-   #xtranslate hb_idleSleep([<x,...>]) => SecondsSleep(<x>)
-   #xtranslate hb_UserName()           => NetName(1)
-   #xtranslate hb_FSize(<x>)           => FileSize(<x>)
-   #xtranslate hb_WildMatch([<x,...>]) => WildMatch(<x>)
-   #xtranslate hb_Deserialize(<x>)     => hb_DeserialNext(<x>)
-   #xtranslate hb_Adler32([<x,...>])   => hb_Checksum(<x>)
+   #xtranslate hb_isregex([<x>])           => hb_isregexstring(<x>)
+   #xtranslate hb_pvalue([<x,...>])        => pvalue(<x>)
+   #xtranslate hb_methodName([<x,...>])    => methodName(<x>)
+   #xtranslate hb_libLoad([<x,...>])       => libLoad(<x>)
+   #xtranslate hb_libFree([<x,...>])       => libFree(<x>)
+   #xtranslate hb_adler32([<x,...>])       => hb_checksum(<x>)
+   #xtranslate hb_setLastKey([<x,...>])    => setLastKey(<x>)
+   #xtranslate hb_CStr([<x,...>])          => CStr(<x>)
+   #xtranslate hb_DirExists(<x>)           => IsDirectory(<x>)
+   #xtranslate hb_rddInfo([<x,...>])       => rddInfo(<x>)
+   #xtranslate hb_idleSleep([<x,...>])     => SecondsSleep(<x>)
+   #xtranslate hb_UserName()               => NetName(1)
+   #xtranslate hb_FSize(<x>)               => FileSize(<x>)
+   #xtranslate hb_WildMatch([<x,...>])     => WildMatch(<x>)
+   #xtranslate hb_Deserialize(<x>)         => hb_DeserialNext(<x>)
 
-   #xtranslate hb_HexToNum([<c,...>])  => HexToNum(<c>)
-   #xtranslate hb_NumToHex([<n,...>])  => NumToHex(<n>)
-   #xtranslate hb_HexToStr([<c,...>])  => HexToStr(<c>)
-   #xtranslate hb_StrToHex([<c,...>])  => StrToHex(<c>)
+   #xtranslate hb_HexToNum([<c,...>])      => HexToNum(<c>)
+   #xtranslate hb_NumToHex([<n,...>])      => NumToHex(<n>)
+   #xtranslate hb_HexToStr([<c,...>])      => HexToStr(<c>)
+   #xtranslate hb_StrToHex([<c,...>])      => StrToHex(<c>)
 
-   #xtranslate hb_AScan([<x,...>])     => AScan(<x>)
-   #xtranslate hb_RAScan([<x,...>])    => RAScan(<x>)
-   #xtranslate hb_AIns([<x,...>])      => AIns(<x>)
-   #xtranslate hb_ADel([<x,...>])      => ADel(<x>)
-   #xtranslate hb_At([<x,...>])        => At(<x>)
+   #xtranslate hb_AScan([<x,...>])         => AScan(<x>)
+   #xtranslate hb_RAScan([<x,...>])        => RAScan(<x>)
+   #xtranslate hb_AIns([<x,...>])          => AIns(<x>)
+   #xtranslate hb_ADel([<x,...>])          => ADel(<x>)
+   #xtranslate hb_At([<x,...>])            => At(<x>)
 
-   #xtranslate hb_ISPOINTER( <xValue> )=> ISPOINTER( <xValue> )
+   #xtranslate hb_ISPOINTER( <xValue> )    => ISPOINTER( <xValue> )
+   #xtranslate hb_ARGV([<x,...>])          => hb_CMDARGARGV(<x>)
 
    #xtranslate hb_IniSetComment([<x,...>]) => hb_SetIniComment(<x>)
    #xtranslate hb_IniRead([<x,...>])       => hb_ReadIni(<x>)
    #xtranslate hb_IniWrite([<x,...>])      => hb_WriteIni(<x>)
 
-   #xtranslate hb_DisableWaitLocks([<x>]) => DisableWaitLocks(<x>)
+   #xtranslate hb_DisableWaitLocks([<x>])  => DisableWaitLocks(<x>)
+
+   #xtranslate hb_mtvm()                   => hb_multiThread()
+   #xtranslate hb_threadWaitForAll()       => WaitForThreads()
+   #xtranslate hb_mutexNotify(<x,...>)     => Notify(<x>)
 
    /* Some statement endings */
    #xcommand ENDSEQUENCE => END
@@ -147,40 +151,39 @@
    #define GTI_CLIENT         2  /* Maximum possible client size of a window */
    #define GTI_MAX            3  /* Maximum possible window size (in Windows) */
 
-   #xtranslate gtSys                   => hb_gtSys
-   #xtranslate gtInfo([<x,...>])       => hb_gtInfo(<x>)
-   #xtranslate hb_gt_Version([<x>])    => hb_gtVersion(<x>)
+   #xtranslate gtSys                       => hb_gtSys
+   #xtranslate gtInfo([<x,...>])           => hb_gtInfo(<x>)
+   #xtranslate hb_gt_Version([<x>])        => hb_gtVersion(<x>)
 
-   #xtranslate gtSetClipboard(<x>)     => hb_gtInfo( HB_GTI_CLIPBOARDDATA, <x> )
-   #xtranslate gtGetClipboard()        => hb_gtInfo( HB_GTI_CLIPBOARDDATA )
-   #xtranslate gtGetClipBoardSize()    => Len( hb_gtInfo( HB_GTI_CLIPBOARDDATA ) )
-   #xtranslate gtPasteClipBoard([<n>]) => hb_gtInfo( HB_GTI_CLIPBOARDPAST )
-   #xtranslate gtProcessMessages()     => NextKey()
-   #xtranslate gfxPrimitive([<x,...>]) => hb_gfxPrimitive(<x>)
-   #xtranslate gfxText([<x,...>])      => hb_gfxText(<x>)
-   #xtranslate MaxRow(.T.)             => hb_gtInfo( HB_GTI_VIEWPORTHEIGHT )
-   #xtranslate MaxCol(.T.)             => hb_gtInfo( HB_GTI_VIEWPORTWIDTH )
+   #xtranslate gtSetClipboard(<x>)         => hb_gtInfo( HB_GTI_CLIPBOARDDATA, <x> )
+   #xtranslate gtGetClipboard()            => hb_gtInfo( HB_GTI_CLIPBOARDDATA )
+   #xtranslate gtGetClipBoardSize()        => Len( hb_gtInfo( HB_GTI_CLIPBOARDDATA ) )
+   #xtranslate gtPasteClipBoard([<n>])     => hb_gtInfo( HB_GTI_CLIPBOARDPAST )
+   #xtranslate gtProcessMessages()         => NextKey()
+   #xtranslate gfxPrimitive([<x,...>])     => hb_gfxPrimitive(<x>)
+   #xtranslate gfxText([<x,...>])          => hb_gfxText(<x>)
+   #xtranslate MaxRow(.T.)                 => hb_gtInfo( HB_GTI_VIEWPORTHEIGHT )
+   #xtranslate MaxCol(.T.)                 => hb_gtInfo( HB_GTI_VIEWPORTWIDTH )
 
-   #xtranslate hb_isregexstring([<x>]) => hb_isregex(<x>)
-   #xtranslate pvalue([<x,...>])       => hb_pvalue(<x>)
-   #xtranslate methodName([<x,...>])   => hb_methodName(<x>)
-   #xtranslate libLoad([<x,...>])      => hb_libLoad(<x>)
-   #xtranslate libFree([<x,...>])      => hb_libFree(<x>)
-   #xtranslate hb_checksum([<x,...>])  => hb_adler32(<x>)
-   #xtranslate setLastKey([<x,...>])   => hb_setLastKey(<x>)
-   #xtranslate CStr([<x,...>])         => hb_CStr(<x>)
-   #xtranslate IsDirectory(<x>)        => hb_DirExists(<x>)
-   #xtranslate SecondsSleep([<x,...>]) => hb_idleSleep(<x>)
-   #xtranslate NetName(<n>)            => iif( ValType( <n> ) == "N" .AND. <n> == 1, hb_UserName(), NetName() )
-   #xtranslate FileSize(<x>)           => hb_FSize(<x>)
-   #xtranslate WildMatch([<x,...>])    => hb_WildMatch(<x>)
-   #xtranslate hb_DeserialNext(<x>)    => hb_Deserialize(<x>)
-   #xtranslate hb_Checksum([<x,...>])  => hb_Adler32(<x>)
+   #xtranslate hb_isregexstring([<x>])     => hb_isregex(<x>)
+   #xtranslate pvalue([<x,...>])           => hb_pvalue(<x>)
+   #xtranslate methodName([<x,...>])       => hb_methodName(<x>)
+   #xtranslate libLoad([<x,...>])          => hb_libLoad(<x>)
+   #xtranslate libFree([<x,...>])          => hb_libFree(<x>)
+   #xtranslate hb_checksum([<x,...>])      => hb_adler32(<x>)
+   #xtranslate setLastKey([<x,...>])       => hb_setLastKey(<x>)
+   #xtranslate CStr([<x,...>])             => hb_CStr(<x>)
+   #xtranslate IsDirectory(<x>)            => hb_DirExists(<x>)
+   #xtranslate SecondsSleep([<x,...>])     => hb_idleSleep(<x>)
+   #xtranslate NetName(<n>)                => iif( ValType( <n> ) == "N" .AND. <n> == 1, hb_UserName(), NetName() )
+   #xtranslate FileSize(<x>)               => hb_FSize(<x>)
+   #xtranslate WildMatch([<x,...>])        => hb_WildMatch(<x>)
+   #xtranslate hb_DeserialNext(<x>)        => hb_Deserialize(<x>)
 
-   #xtranslate HexToNum([<c,...>])     => hb_HexToNum(<c>)
-   #xtranslate NumToHex([<n,...>])     => hb_NumToHex(<n>)
-   #xtranslate HexToStr([<c,...>])     => hb_HexToStr(<c>)
-   #xtranslate StrToHex([<c,...>])     => hb_StrToHex(<c>)
+   #xtranslate HexToNum([<c,...>])         => hb_HexToNum(<c>)
+   #xtranslate NumToHex([<n,...>])         => hb_NumToHex(<n>)
+   #xtranslate HexToStr([<c,...>])         => hb_HexToStr(<c>)
+   #xtranslate StrToHex([<c,...>])         => hb_StrToHex(<c>)
 
    #xtranslate AScan(<a>,<b>,[<c>],[<d>],<e>) => hb_AScan(<a>,<b>,<c>,<d>,<e>)
    #xtranslate RAScan([<x,...>])              => hb_RAScan(<x>)
@@ -188,43 +191,47 @@
    #xtranslate ADel(<a>,<n>,<l>)              => hb_ADel(<a>,<n>,<l>)
    #xtranslate At(<a>,<b>,[<x,...>])          => hb_At(<a>,<b>,<x>)
 
-   #xtranslate ISPOINTER( <xValue> )   => hb_ISPOINTER( <xValue> )
+   #xtranslate ISPOINTER( <xValue> )       => hb_ISPOINTER( <xValue> )
 
    #xtranslate hb_SetIniComment([<x,...>]) => hb_IniSetComment(<x>)
    #xtranslate hb_ReadIni([<x,...>])       => hb_IniRead(<x>)
    #xtranslate hb_WriteIni([<x,...>])      => hb_IniWrite(<x>)
 
-   #xtranslate DisableWaitLocks([<x>]) => hb_DisableWaitLocks(<x>)
+   #xtranslate DisableWaitLocks([<x>])     => hb_DisableWaitLocks(<x>)
 
-   #xtranslate Str(<x>,[<y>],[<y>],<z>)=> iif(<z>, hb_NToS(<x>), Str(<x>))
-   #xtranslate hb_CMDARGARGV([<x,...>])=> hb_ARGV(0)
+   #xtranslate hb_multiThread()            => hb_mtvm()
+   #xtranslate WaitForThreads()            => hb_threadWaitForAll()
+   #xtranslate Notify(<x,...>)             => hb_mutexNotify(<x>)
+
+   #xtranslate Str(<x>,[<y>],[<y>],<z>)    => iif(<z>, hb_NToS(<x>), Str(<x>))
+   #xtranslate hb_CMDARGARGV([<x,...>])    => hb_ARGV(<x>)
 
    /* Hash item functions */
-   #xtranslate HASH([<x,...>])         => hb_HASH(<x>)
-   #xtranslate HHASKEY([<x,...>])      => hb_HHASKEY(<x>)
-   #xtranslate HGETPOS([<x,...>])      => hb_HPOS(<x>)
-   #xtranslate HGET([<x,...>])         => hb_HGET(<x>)
-   #xtranslate HSET([<x,...>])         => hb_HSET(<x>)
-   #xtranslate HDEL([<x,...>])         => hb_HDEL(<x>)
-   #xtranslate HGETKEYAT([<x,...>])    => hb_HKEYAT(<x>)
-   #xtranslate HGETVALUEAT([<x,...>])  => hb_HVALUEAT(<x>)
-   #xtranslate HSETVALUEAT([<x,...>])  => hb_HVALUEAT(<x>)
-   #xtranslate HGETPAIRAT([<x,...>])   => hb_HPAIRAT(<x>)
-   #xtranslate HDELAT([<x,...>])       => hb_HDELAT(<x>)
-   #xtranslate HGETKEYS([<x,...>])     => hb_HKEYS(<x>)
-   #xtranslate HGETVALUES([<x,...>])   => hb_HVALUES(<x>)
-   #xtranslate HFILL([<x,...>])        => hb_HFILL(<x>)
-   #xtranslate HCLONE([<x,...>])       => hb_HCLONE(<x>)
-   #xtranslate HCOPY([<x,...>])        => hb_HCOPY(<x>)
-   #xtranslate HMERGE([<x,...>])       => hb_HMERGE(<x>)
-   #xtranslate HEVAL([<x,...>])        => hb_HEVAL(<x>)
-   #xtranslate HSCAN([<x,...>])        => hb_HSCAN(<x>)
-   #xtranslate HSETCASEMATCH([<x,...>])=> hb_HSETCASEMATCH(<x>)
-   #xtranslate HGETCASEMATCH([<x,...>])=> hb_HCASEMATCH(<x>)
-   #xtranslate HSETAUTOADD([<x,...>])  => hb_HSETAUTOADD(<x>)
-   #xtranslate HGETAUTOADD([<x,...>])  => hb_HAUTOADD(<x>)
-   #xtranslate HALLOCATE([<x,...>])    => hb_HALLOCATE(<x>)
-   #xtranslate HDEFAULT([<x,...>])     => hb_HDEFAULT(<x>)
+   #xtranslate HASH([<x,...>])             => hb_HASH(<x>)
+   #xtranslate HHASKEY([<x,...>])          => hb_HHASKEY(<x>)
+   #xtranslate HGETPOS([<x,...>])          => hb_HPOS(<x>)
+   #xtranslate HGET([<x,...>])             => hb_HGET(<x>)
+   #xtranslate HSET([<x,...>])             => hb_HSET(<x>)
+   #xtranslate HDEL([<x,...>])             => hb_HDEL(<x>)
+   #xtranslate HGETKEYAT([<x,...>])        => hb_HKEYAT(<x>)
+   #xtranslate HGETVALUEAT([<x,...>])      => hb_HVALUEAT(<x>)
+   #xtranslate HSETVALUEAT([<x,...>])      => hb_HVALUEAT(<x>)
+   #xtranslate HGETPAIRAT([<x,...>])       => hb_HPAIRAT(<x>)
+   #xtranslate HDELAT([<x,...>])           => hb_HDELAT(<x>)
+   #xtranslate HGETKEYS([<x,...>])         => hb_HKEYS(<x>)
+   #xtranslate HGETVALUES([<x,...>])       => hb_HVALUES(<x>)
+   #xtranslate HFILL([<x,...>])            => hb_HFILL(<x>)
+   #xtranslate HCLONE([<x,...>])           => hb_HCLONE(<x>)
+   #xtranslate HCOPY([<x,...>])            => hb_HCOPY(<x>)
+   #xtranslate HMERGE([<x,...>])           => hb_HMERGE(<x>)
+   #xtranslate HEVAL([<x,...>])            => hb_HEVAL(<x>)
+   #xtranslate HSCAN([<x,...>])            => hb_HSCAN(<x>)
+   #xtranslate HSETCASEMATCH([<x,...>])    => hb_HSETCASEMATCH(<x>)
+   #xtranslate HGETCASEMATCH([<x,...>])    => hb_HCASEMATCH(<x>)
+   #xtranslate HSETAUTOADD([<x,...>])      => hb_HSETAUTOADD(<x>)
+   #xtranslate HGETAUTOADD([<x,...>])      => hb_HAUTOADD(<x>)
+   #xtranslate HALLOCATE([<x,...>])        => hb_HALLOCATE(<x>)
+   #xtranslate HDEFAULT([<x,...>])         => hb_HDEFAULT(<x>)
 
    /* Inet functions */
    #xtranslate INETINIT([<x,...>])                => hb_INETINIT(<x>)