diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 247e77e061..a35f5a8663 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-29 18:15 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * examples/terminal/trm_cli.prg
+  * examples/terminal/terminal.prg
+  * examples/terminal/terminal.hbc
+    ! xhb lib not needed anymore.
+
 2009-05-29 18:04 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * contrib/gtwvg/gtwvg.h
     + Added extern for hb_wvt_GetStringAttrib(), hb_wvt_PutStringAttrib().
diff --git a/harbour/examples/terminal/terminal.hbc b/harbour/examples/terminal/terminal.hbc
index 739085da3a..b7ca6074be 100644
--- a/harbour/examples/terminal/terminal.hbc
+++ b/harbour/examples/terminal/terminal.hbc
@@ -3,6 +3,6 @@
 #
 
 incpaths=../../contrib/gtwvg
-{win}libs=gtwvg hbwin xhb
+{win}libs=gtwvg hbwin
 mt=yes
 gui=yes
diff --git a/harbour/examples/terminal/terminal.prg b/harbour/examples/terminal/terminal.prg
index 0afc2d1912..0998ef9a12 100644
--- a/harbour/examples/terminal/terminal.prg
+++ b/harbour/examples/terminal/terminal.prg
@@ -156,7 +156,7 @@ Static Function RmtSvrInitAsServer( cServerInfo, Socket, nTimeoutClient )
       // Wait for 1 minutes maximum : W A T C H  INI Controlled
       //
       Hb_INetTimeout( Socket, nTimeoutClient )
-TrmDebug( "SERVER: Connection Established!", INetPort( Socket ) )
+TrmDebug( "SERVER: Connection Established!", hb_INetPort( Socket ) )
    else
 TrmDebug( "SERVER: Connection Failed" )
    endif
@@ -184,7 +184,7 @@ TrmDebug( "SvrConnectClient()", i++, "TRY..." )
    enddo
 
    if lRet
-TrmDebug( "CLIENT: Connection Established!", INetPort( pClientSocket ) )
+TrmDebug( "CLIENT: Connection Established!", hb_INetPort( pClientSocket ) )
    else
 TrmDebug( "CLIENT: Connection TimedOut!" )
    endif
@@ -239,8 +239,8 @@ Function RmtSvrSendClient( nMode, xData )
             if lSendScrn
                nScreen++
 
-               cOdd0 := hb_compress( cOdd )
-               cEvn0 := hb_compress( cEvn )
+               cOdd0 := hb_zcompress( cOdd )
+               cEvn0 := hb_zcompress( cEvn )
 
                cData := '<SCR>'    +;
                         NTRIM( TOP ) +';'+ NTRIM( LFT ) +';'+ NTRIM( BTM ) +';'+ NTRIM( RGT ) +';'+;
@@ -276,10 +276,10 @@ Function RmtSvrSendClient( nMode, xData )
          if len( cData ) > 0
             cData        += ENDBLOCK
             nBytesToSend := len( cData )
-            nBytesSent   := INetSendAll( commSocket, cData, nBytesToSend )
+            nBytesSent   := hb_INetSendAll( commSocket, cData, nBytesToSend )
 
             if nBytesSent <> nBytesToSend
-               nError := INetErrorCode( commSocket )
+               nError := hb_INetErrorCode( commSocket )
 TrmDebug( n,'E','VouchServer - SvrSendClient : ', nError, nBytesSent, nBytesToSend )
 
                do case
@@ -308,10 +308,10 @@ Static Function RmtSvrReceiveClient()
    static lInProcess := .f.
 
    if !lInProcess
-      if INetDataReady( commSocket ) > 0
+      if hb_INetDataReady( commSocket ) > 0
          lInProcess := .t.
 
-         cKey := INetRecvLine( commSocket, @nBytes )
+         cKey := hb_INetRecvLine( commSocket, @nBytes )
 
          if nBytes > 0
             Wvt_Keyboard( val( cKey ) )
@@ -319,9 +319,9 @@ Static Function RmtSvrReceiveClient()
          elseif nBytes == 1
 
          else
-            nError := INetErrorCode( commSocket )
+            nError := hb_INetErrorCode( commSocket )
             if ascan( { -2, WSAECONNABORTED, WSAECONNRESET }, nError ) > 0
-TrmDebug( 'VouchAsServer - Quitting : Error =', INetErrorCode( commSocket ), 'nBytes =', nBytes )
+TrmDebug( 'VouchAsServer - Quitting : Error =', hb_INetErrorCode( commSocket ), 'nBytes =', nBytes )
                DbCloseAll()
                Quit
             endif
@@ -350,7 +350,7 @@ Function Wvt_Timer( wParam )
 
    case TIMER_PING
       if !( lSendingClient )
-         INetSendAll( commSocket, ENDBLOCK )
+         hb_INetSendAll( commSocket, ENDBLOCK )
       endif
       exit
 
diff --git a/harbour/examples/terminal/trm_cli.prg b/harbour/examples/terminal/trm_cli.prg
index 2ac70e8930..dfa821253c 100644
--- a/harbour/examples/terminal/trm_cli.prg
+++ b/harbour/examples/terminal/trm_cli.prg
@@ -336,9 +336,9 @@ Function TrmReceiveServer()
                   n := ( b_[ 3 ]-b_[ 1 ]+1 ) * ( b_[ 4 ]-b_[ 2 ]+1 )
 
                   cOdd1 := substr( a_[ 2 ], 1, b_[ 5 ] )
-                  cOdd  := hb_uncompress( n, cOdd1 )
+                  cOdd  := hb_zuncompress( cOdd1, n )
                   cEvn1 := substr( a_[ 2 ], b_[ 5 ]+1 )
-                  cEvn  := hb_uncompress( n, cEvn1 )
+                  cEvn  := hb_zuncompress( cEvn1, n )
 
                   PUTSCREENATTRIB( b_[ 1 ], b_[ 2 ], b_[ 3 ], b_[ 4 ], cOdd, cEvn )