diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 18f30aacdb..68a58841d6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,31 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-14 04:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/rtl/mousex.c
+  * src/rdd/dbcmdx.c
+  * contrib/xpp/mousex.c
+  * contrib/xpp/dbcmdx.c
+  * contrib/hbtpathy/tpwin.c
+  * contrib/hbgt/bitflags.c
+  * contrib/hbsqlit3/hbsqlit3.c
+  * contrib/hbnf/fttext.c
+  * contrib/hbnf/putkey.c
+  * contrib/hbclipsm/time.c
+  * contrib/hbtip/utils.c
+  * contrib/hbtip/encmthd.c
+    + BOOL/TRUE/FALSE -> HB_BOOL/HB_TRUE/HB_FALSE
+
+  * contrib/hbsqlit3/hbsqlit3.c
+    ! Marked local support functions as 'static'.
+
+  * contrib/hbnf/mouse.c
+    * BOOL -> int
+    % Using hb_arraySet*() API.
+
+  * contrib/hbgd/gdwrp.c
+    ! Added missing hb_numToHandle() calls.
+
 2010-01-14 04:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * src/rtl/binnumx.c
   * contrib/xpp/binnumx.c
diff --git a/harbour/contrib/hbclipsm/time.c b/harbour/contrib/hbclipsm/time.c
index 32dfc28446..daacdfefeb 100644
--- a/harbour/contrib/hbclipsm/time.c
+++ b/harbour/contrib/hbclipsm/time.c
@@ -99,7 +99,7 @@ HB_FUNC( TIMEDIFF )
 HB_FUNC( TIMEISVALID )
 {
    const char * pszTime = hb_parc( 1 );
-   BOOL bRet = FALSE;
+   HB_BOOL bRet = HB_FALSE;
 
    if( pszTime )
    {
@@ -107,7 +107,7 @@ HB_FUNC( TIMEISVALID )
           atol( pszTime + 3 ) < 60 &&
           atol( pszTime + 6 ) < 60 )
       {
-         bRet = TRUE;
+         bRet = HB_TRUE;
       }
    }
 
diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c
index 99c26697f5..640696f3da 100644
--- a/harbour/contrib/hbgd/gdwrp.c
+++ b/harbour/contrib/hbgd/gdwrp.c
@@ -371,7 +371,7 @@ static void GDImageCreateFrom( int nType )
      )
    {
       /* Retrieve file handle */
-      HB_FHANDLE fhandle = HB_ISNUM( 1 ) ? hb_parnint( 1 ) : 0; /* 0 = std input */
+      HB_FHANDLE fhandle = HB_ISNUM( 1 ) ? hb_numToHandle( hb_parnint( 1 ) ) : 0; /* 0 = std input */
 
       /* Retrieve image size */
       sz     = hb_parni( 2 );
@@ -529,7 +529,10 @@ static void GDImageSaveTo( int nType )
       else if( HB_ISNUM( 2 ) )
       {
          /* Write to std output or to a passed file */
-         HB_FHANDLE fhandle = ( hb_parnint( 2 ) != FS_ERROR ) ? hb_parnint( 2 ) : 1; /* 1 = std output */
+         HB_FHANDLE fhandle = hb_numToHandle( hb_parnint( 2 ) );
+
+         if( fhandle == FS_ERROR )
+            fhandle = 1; /* 1 = std output */
 
          /* Write Image */
          SaveImageToHandle( fhandle, iptr, sz );
@@ -3698,7 +3701,7 @@ HB_FUNC( GDIMAGEGIFANIMBEGIN )
       else if( HB_ISNUM( 2 ) || HB_ISNIL( 2 ) )
       {
          /* Retrieve file handle */
-         HB_FHANDLE fhandle = HB_ISNUM( 2 ) ? hb_parnint( 2 ) : 1; /* 1 = std output */
+         HB_FHANDLE fhandle = HB_ISNUM( 2 ) ? hb_numToHandle( hb_parnint( 2 ) ) : 1; /* 1 = std output */
 
          SaveImageToHandle( fhandle, iptr, size );
       }
@@ -3754,7 +3757,7 @@ HB_FUNC( GDIMAGEGIFANIMADD )
       else if( HB_ISNUM( 2 ) || HB_ISNIL( 2 ) )
       {
          /* Retrieve file handle */
-         HB_FHANDLE fhandle = HB_ISNUM( 2 ) ? hb_parnint( 2 ) : 1; /* 1 = std output */
+         HB_FHANDLE fhandle = HB_ISNUM( 2 ) ? hb_numToHandle( hb_parnint( 2 ) ) : 1; /* 1 = std output */
 
          SaveImageToHandle( fhandle, iptr, size );
       }
@@ -3793,7 +3796,7 @@ HB_FUNC( GDIMAGEGIFANIMEND )
       else if( HB_ISNUM( 2 ) || HB_ISNIL( 2 ) )
       {
          /* Retrieve file handle */
-         HB_FHANDLE fhandle = HB_ISNUM( 1 ) ? hb_parnint( 1 ) : 1; /* 1 = std output */
+         HB_FHANDLE fhandle = HB_ISNUM( 1 ) ? hb_numToHandle( hb_parnint( 1 ) ) : 1; /* 1 = std output */
 
          SaveImageToHandle( fhandle, iptr, size );
       }
diff --git a/harbour/contrib/hbgt/bitflags.c b/harbour/contrib/hbgt/bitflags.c
index d3b66fb236..80267a1ab8 100644
--- a/harbour/contrib/hbgt/bitflags.c
+++ b/harbour/contrib/hbgt/bitflags.c
@@ -151,7 +151,7 @@ HB_FUNC( GT_CLRFLAG )
 HB_FUNC( GT_ISFLAG  )
 {
 
-        BOOL            FlagStatus = FALSE;
+        HB_BOOL         FlagStatus = HB_FALSE;
         unsigned        Bit        = 1;
         unsigned        BitPointer;
         unsigned        BytePointer;
diff --git a/harbour/contrib/hbnf/fttext.c b/harbour/contrib/hbnf/fttext.c
index 5d56535fcf..7e93e79ee2 100644
--- a/harbour/contrib/hbnf/fttext.c
+++ b/harbour/contrib/hbnf/fttext.c
@@ -192,7 +192,7 @@ static int _ins_buff( int bytes );
 static int _del_buff( int bytes );
 static long _ft_skip( long recs );
 static int _writeLine( const char * theData, ULONG iDataLen );
-static BOOL _writeeol( HB_FHANDLE fhnd );
+static HB_BOOL _writeeol( HB_FHANDLE fhnd );
 
 /* arrays used by the text workareas */
 static int        area = 0;
@@ -1974,7 +1974,7 @@ static int _writeLine( const char * theData, ULONG iDataLen )
    return err;
 }
 
-static BOOL _writeeol( HB_FHANDLE fhnd )
+static HB_BOOL _writeeol( HB_FHANDLE fhnd )
 {
    const char * crlf = hb_conNewLine();
    ULONG len = strlen( crlf );
diff --git a/harbour/contrib/hbnf/mouse.c b/harbour/contrib/hbnf/mouse.c
index ea0bd73524..8d95819f69 100644
--- a/harbour/contrib/hbnf/mouse.c
+++ b/harbour/contrib/hbnf/mouse.c
@@ -436,7 +436,7 @@ HB_FUNC( _M_MBUTPRS )
    int inX;
    int inY;
    int inButton;
-   BOOL lStatus;
+   int lStatus;
 #if defined( HB_OS_DOS )
    {
       union REGS regs;
@@ -458,24 +458,14 @@ HB_FUNC( _M_MBUTPRS )
    }
 #endif
    {
-      PHB_ITEM pArray =     hb_itemArrayNew( 4 );
-      PHB_ITEM pY =         hb_itemPutNI( NULL, inY );
-      PHB_ITEM pX =         hb_itemPutNI( NULL, inX );
-      PHB_ITEM pButton =    hb_itemPutNI( NULL, inButton );
-      PHB_ITEM pStatus =    hb_itemPutNI( NULL, lStatus );
+      PHB_ITEM pArray = hb_itemArrayNew( 4 );
 
-      hb_itemArrayPut( pArray, 1, pButton ); /* NOTE: I've changed 1 to 3 */
-      hb_itemArrayPut( pArray, 2, pX );
-      hb_itemArrayPut( pArray, 3, pY );
-      hb_itemArrayPut( pArray, 4, pStatus ); /* NOTE: I've changed 1 to 3 */
+      hb_arraySetNI( pArray, 1, inButton ); /* NOTE: I've changed 1 to 3 */
+      hb_arraySetNI( pArray, 2, inX );
+      hb_arraySetNI( pArray, 3, inY );
+      hb_arraySetNI( pArray, 4, lStatus ); /* NOTE: I've changed 1 to 3 */
 
-      hb_itemReturn( pArray );
-
-      hb_itemRelease( pArray );
-      hb_itemRelease( pX );
-      hb_itemRelease( pY );
-      hb_itemRelease( pStatus );
-      hb_itemRelease( pButton );
+      hb_itemReturnRelease( pArray );
    }
 }
 
diff --git a/harbour/contrib/hbnf/putkey.c b/harbour/contrib/hbnf/putkey.c
index 067afe5cae..77c7a39d94 100644
--- a/harbour/contrib/hbnf/putkey.c
+++ b/harbour/contrib/hbnf/putkey.c
@@ -245,7 +245,7 @@ End
 
 HB_FUNC( FT_PUTKEY )
 {
-   BOOL lSuccess = FALSE;
+   HB_BOOL lSuccess = HB_FALSE;
 
    if( HB_ISNUM( 1 ) )
    {
@@ -254,7 +254,7 @@ HB_FUNC( FT_PUTKEY )
       if( iKey >= -39 && iKey <= 385 )
       {
          hb_inkeyPut( iKey );
-         lSuccess = TRUE;
+         lSuccess = HB_TRUE;
       }
    }
    hb_retl( lSuccess );
diff --git a/harbour/contrib/hbsqlit3/hbsqlit3.c b/harbour/contrib/hbsqlit3/hbsqlit3.c
index c300dbf8ac..880feb1395 100644
--- a/harbour/contrib/hbsqlit3/hbsqlit3.c
+++ b/harbour/contrib/hbsqlit3/hbsqlit3.c
@@ -75,11 +75,12 @@
 #ifdef SQLITE3_LIB
 extern char *sqlite3_temp_directory;
 #endif /* SQLITE3_LIB */
-PHB_ITEM    hb_sqlite3_itemPut( PHB_ITEM pItem, void *pMemAddr, int iType );
-void        *hb_sqlite3_itemGet( PHB_ITEM pItem, int iType, BOOL fError );
-void        hb_sqlite3_ret( void *pMemAddr, int iType );
-void        *hb_sqlite3_param( int iParam, int iType, BOOL fError );
-BOOL        hb_sqlite3_store( void *pMemAddr, int iType, int iParam );
+
+static PHB_ITEM hb_sqlite3_itemPut( PHB_ITEM pItem, void *pMemAddr, int iType );
+static void *   hb_sqlite3_itemGet( PHB_ITEM pItem, int iType, HB_BOOL fError );
+static void     hb_sqlite3_ret( void *pMemAddr, int iType );
+static void *   hb_sqlite3_param( int iParam, int iType, HB_BOOL fError );
+static HB_BOOL  hb_sqlite3_store( void *pMemAddr, int iType, int iParam );
 
 static int  callback( void *, int, char **, char ** );
 static int  authorizer( void *, int, const char *, const char *, const char *, const char * );
@@ -164,13 +165,13 @@ static const HB_GC_FUNCS s_gcSqlite3Funcs =
 };
 
 
-PHB_ITEM hb_sqlite3_itemPut( PHB_ITEM pItem, void *pMemAddr, int iType )
+static PHB_ITEM hb_sqlite3_itemPut( PHB_ITEM pItem, void *pMemAddr, int iType )
 {
    PHB_SQLITE3_HOLDER   pStructHolder;
 
    if( pItem )
    {
-      if( HB_IS_COMPLEX(pItem) )
+      if( HB_IS_COMPLEX( pItem ) )
       {
          hb_itemClear( pItem );
       }
@@ -187,7 +188,7 @@ PHB_ITEM hb_sqlite3_itemPut( PHB_ITEM pItem, void *pMemAddr, int iType )
    return hb_itemPutPtrGC( pItem, pStructHolder );
 }
 
-void *hb_sqlite3_itemGet( PHB_ITEM pItem, int iType, BOOL fError )
+static void *hb_sqlite3_itemGet( PHB_ITEM pItem, int iType, HB_BOOL fError )
 {
    PHB_SQLITE3_HOLDER   pStructHolder = ( PHB_SQLITE3_HOLDER ) hb_itemGetPtrGC( pItem, &s_gcSqlite3Funcs );
    int                  iError = 0;
@@ -219,26 +220,26 @@ void *hb_sqlite3_itemGet( PHB_ITEM pItem, int iType, BOOL fError )
    return NULL;
 }
 
-void hb_sqlite3_ret( void *pMemAddr, int iType )
+static void hb_sqlite3_ret( void *pMemAddr, int iType )
 {
    hb_sqlite3_itemPut( hb_stackReturnItem(), pMemAddr, iType );
 }
 
-void *hb_sqlite3_param( int iParam, int iType, BOOL fError )
+static void *hb_sqlite3_param( int iParam, int iType, HB_BOOL fError )
 {
    return hb_sqlite3_itemGet( hb_param(iParam, HB_IT_POINTER), iType, fError );
 }
 
-BOOL hb_sqlite3_store( void *pMemAddr, int iType, int iParam )
+static HB_BOOL hb_sqlite3_store( void *pMemAddr, int iType, int iParam )
 {
    PHB_ITEM pItem = hb_param( iParam, HB_IT_BYREF );
    if( !pItem )
    {
-      return FALSE;
+      return HB_FALSE;
    }
 
    hb_sqlite3_itemPut( pItem, pMemAddr, iType );
-   return TRUE;
+   return HB_TRUE;
 }
 
 /**
@@ -455,7 +456,7 @@ HB_FUNC( SQLITE3_SHUTDOWN )
 
 HB_FUNC( SQLITE3_EXTENDED_RESULT_CODES )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -478,7 +479,7 @@ HB_FUNC( SQLITE3_EXTENDED_RESULT_CODES )
 
 HB_FUNC( SQLITE3_ERRCODE )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -493,7 +494,7 @@ HB_FUNC( SQLITE3_ERRCODE )
 HB_FUNC( SQLITE3_EXTENDED_ERRCODE )
 {
 #if SQLITE_VERSION_NUMBER >= 3006005
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -510,7 +511,7 @@ HB_FUNC( SQLITE3_EXTENDED_ERRCODE )
 
 HB_FUNC( SQLITE3_ERRMSG )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -541,7 +542,7 @@ HB_FUNC( SQLITE3_SLEEP )
 
 HB_FUNC( SQLITE3_LAST_INSERT_ROWID )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -556,29 +557,29 @@ HB_FUNC( SQLITE3_LAST_INSERT_ROWID )
 /**
    Name Of The Folder Holding Temporary Files
 
-   sqlite3_temp_directory( cDirName ) -> lResult (TRUE/FALSE)
+   sqlite3_temp_directory( cDirName ) -> lResult (HB_TRUE/HB_FALSE)
 */
 
 HB_FUNC( SQLITE3_TEMP_DIRECTORY )
 {
-   BOOL  bResult = FALSE;
+   HB_BOOL  bResult = HB_FALSE;
 
    #ifdef SQLITE3_LIB
    {
-      BOOL  fFree;
-      char  *pszDirName = hb_fsNameConv( hb_parcx(1), &fFree );
+      HB_BOOL fFree;
+      char *  pszDirName = hb_fsNameConv( hb_parcx( 1 ), &fFree );
 
       if( hb_fsIsDirectory(pszDirName) )
       {
-         bResult = TRUE;
+         bResult = HB_TRUE;
       }
       else
       {
-         if( hb_parl(2) )  /* create temp directory if not exist */
+         if( hb_parl( 2 ) )  /* create temp directory if not exist */
          {
             if( hb_fsMkDir(pszDirName) )
             {
-               bResult = TRUE;
+               bResult = HB_TRUE;
             }
             else
             {
@@ -686,7 +687,7 @@ HB_FUNC( SQLITE3_OPEN_V2 )
 
 HB_FUNC( SQLITE3_EXEC )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -744,7 +745,7 @@ HB_FUNC( SQLITE3_EXEC )
 
 HB_FUNC( SQLITE3_PREPARE )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1136,7 +1137,7 @@ HB_FUNC( SQLITE3_BIND_PARAMETER_NAME )
 
 HB_FUNC( SQLITE3_CHANGES )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1156,7 +1157,7 @@ HB_FUNC( SQLITE3_CHANGES )
 
 HB_FUNC( SQLITE3_TOTAL_CHANGES )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1359,7 +1360,7 @@ HB_FUNC( SQLITE3_COLUMN_TEXT )
 
 HB_FUNC( SQLITE3_ENABLE_LOAD_EXTENSION )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1390,7 +1391,7 @@ HB_FUNC( SQLITE3_RESET_AUTO_EXTENSION )
 
 HB_FUNC( SQLITE3_BUSY_TIMEOUT )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1410,7 +1411,7 @@ HB_FUNC( SQLITE3_BUSY_TIMEOUT )
 
 HB_FUNC( SQLITE3_GET_TABLE )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1471,7 +1472,7 @@ HB_FUNC( SQLITE3_GET_TABLE )
 #ifdef SQLITE_ENABLE_COLUMN_METADATA
 HB_FUNC( SQLITE3_TABLE_COLUMN_METADATA )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1501,9 +1502,9 @@ HB_FUNC( SQLITE3_TABLE_COLUMN_METADATA )
 
          hb_arraySetC( pArray, 1, ( char * ) pzDataType );
          hb_arraySetC( pArray, 2, ( char * ) pzCollSeq );
-         hb_arraySetL( pArray, 3, (BOOL) iNotNull );
-         hb_arraySetL( pArray, 4, (BOOL) iPrimaryKey );
-         hb_arraySetL( pArray, 5, (BOOL) iAutoinc );
+         hb_arraySetL( pArray, 3, ( HB_BOOL ) ( iNotNull != 0 ) );
+         hb_arraySetL( pArray, 4, ( HB_BOOL ) ( iPrimaryKey != 0 ) );
+         hb_arraySetL( pArray, 5, ( HB_BOOL ) ( iAutoinc != 0 ) );
 
          hb_itemReturnRelease( pArray );
       }
@@ -1580,7 +1581,7 @@ HB_FUNC( SQLITE3_COLUMN_ORIGIN_NAME )
 
 HB_FUNC( SQLITE3_BLOB_OPEN )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1715,12 +1716,12 @@ HB_FUNC( SQLITE3_BLOB_WRITE )
 /**
     Test To See If The Database Is In Auto-Commit Mode
 
-    sqlite3_get_autocommit( db ) -> lResult (TRUE/FALSE)
+    sqlite3_get_autocommit( db ) -> lResult (HB_TRUE/HB_FALSE)
 */
 
 HB_FUNC( SQLITE3_GET_AUTOCOMMIT )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1780,7 +1781,7 @@ static void SQL3TraceLog( void *sFile, const char *sTraceMsg )
 
 HB_FUNC( SQLITE3_PROFILE )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1794,7 +1795,7 @@ HB_FUNC( SQLITE3_PROFILE )
 
 HB_FUNC( SQLITE3_TRACE )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1859,7 +1860,7 @@ HB_FUNC( SQLITE3_BUFF_TO_FILE )
 
 HB_FUNC( SQLITE3_INTERRUPT )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1875,7 +1876,7 @@ HB_FUNC( SQLITE3_INTERRUPT )
 
 HB_FUNC( SQLITE3_BUSY_HANDLER )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -1937,7 +1938,7 @@ HB_FUNC( SQLITE3_BUSY_HANDLER )
 
 HB_FUNC( SQLITE3_PROGRESS_HANDLER )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -2000,7 +2001,7 @@ HB_FUNC( SQLITE3_PROGRESS_HANDLER )
 
 HB_FUNC( SQLITE3_COMMIT_HOOK )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -2056,7 +2057,7 @@ HB_FUNC( SQLITE3_COMMIT_HOOK )
 
 HB_FUNC( SQLITE3_ROLLBACK_HOOK )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -2118,7 +2119,7 @@ HB_FUNC( SQLITE3_ROLLBACK_HOOK )
 
 HB_FUNC( SQLITE3_SET_AUTHORIZER )
 {
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db )
    {
@@ -2191,8 +2192,8 @@ HB_FUNC( SQLITE3_SET_AUTHORIZER )
 HB_FUNC( SQLITE3_BACKUP_INIT )
 {
 #if SQLITE_VERSION_NUMBER >= 3006011
-   HB_SQLITE3     *pHbSqlite3Dest = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
-   HB_SQLITE3     *pHbSqlite3Source = ( HB_SQLITE3 * ) hb_sqlite3_param( 3, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3     *pHbSqlite3Dest = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
+   HB_SQLITE3     *pHbSqlite3Source = ( HB_SQLITE3 * ) hb_sqlite3_param( 3, HB_SQLITE3_DB, HB_TRUE );
    sqlite3_backup *pBackup;
 
    if( pHbSqlite3Dest && pHbSqlite3Dest->db && pHbSqlite3Source && pHbSqlite3Source->db && HB_ISCHAR(2) && HB_ISCHAR(4) )
@@ -2357,7 +2358,7 @@ HB_FUNC( SQLITE3_DB_STATUS )
 {
 #if SQLITE_VERSION_NUMBER >= 3006001
    int         iCurrent, iHighwater;
-   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, TRUE );
+   HB_SQLITE3  *pHbSqlite3 = ( HB_SQLITE3 * ) hb_sqlite3_param( 1, HB_SQLITE3_DB, HB_TRUE );
 
    if( pHbSqlite3 && pHbSqlite3->db && (hb_pcount() > 4) && (HB_ISNUM(3) && HB_ISBYREF(3)) && (HB_ISNUM(4) && HB_ISBYREF(4)) )
    {
diff --git a/harbour/contrib/hbtip/encmthd.c b/harbour/contrib/hbtip/encmthd.c
index ed3f331e43..7a961236f7 100644
--- a/harbour/contrib/hbtip/encmthd.c
+++ b/harbour/contrib/hbtip/encmthd.c
@@ -66,7 +66,7 @@ HB_FUNC( TIPENCODERBASE64_ENCODE )
    int nPosBlock = 0, nLineCount = 0;
    ULONG nFinalLen;
    unsigned char cElem, cElem1;
-   BOOL bExcept;
+   HB_BOOL bExcept;
 
    if( ! cData )
    {
@@ -437,15 +437,13 @@ HB_FUNC( TIPENCODERURL_ENCODE )
 {
    const char *cData = hb_parc( 1 );
    int nLen = hb_parclen( 1 );
-   BOOL bComplete = hb_parl( 2 );
+   HB_BOOL bComplete = hb_parl( 2 );
    char *cRet;
    int nPos = 0, nPosRet = 0, nVal;
    char cElem;
 
    if( hb_pcount() < 2 )
-   {
-      bComplete = TRUE;
-   }
+      bComplete = HB_TRUE;
 
    if( ! cData )
    {
diff --git a/harbour/contrib/hbtip/utils.c b/harbour/contrib/hbtip/utils.c
index e98c4314d0..3f32263550 100644
--- a/harbour/contrib/hbtip/utils.c
+++ b/harbour/contrib/hbtip/utils.c
@@ -384,7 +384,7 @@ static const char * s_findMimeStringInTree( const char * cData, int iLen, int iE
 static const char * s_findStringMimeType( const char * cData, int iLen )
 {
    int iCount;
-   BOOL bFormFeed;
+   HB_BOOL bFormFeed;
 
    for( iCount = 0; iCount < MIME_TABLE_SIZE; iCount++ )
    {
@@ -434,18 +434,18 @@ static const char * s_findStringMimeType( const char * cData, int iLen )
    }
 
    /* Failure; let's see if it's a text/plain. */
-   bFormFeed = FALSE;
+   bFormFeed = HB_FALSE;
    iCount = 0;
    while( iCount < iLen )
    {
       /* form feed? */
       if( cData[ iCount ] == '\x0C' )
-         bFormFeed = TRUE;
+         bFormFeed = HB_TRUE;
 
       /* esc sequence? */
       else if( cData[ iCount ] == '\x1B' )
       {
-         bFormFeed = TRUE;
+         bFormFeed = HB_TRUE;
          iCount++;
          if( cData[ iCount ] <= 27 )
             iCount++;
diff --git a/harbour/contrib/hbtpathy/tpwin.c b/harbour/contrib/hbtpathy/tpwin.c
index 803cd2c1a9..b4aeb25751 100644
--- a/harbour/contrib/hbtpathy/tpwin.c
+++ b/harbour/contrib/hbtpathy/tpwin.c
@@ -165,7 +165,7 @@ HB_FUNC( __TP_ISDCD )
    DWORD dwModemStat = 0;
    BOOL bRet = GetCommModemStatus( ( HANDLE ) ( HB_PTRUINT ) hb_parnint( 1 ), &dwModemStat );
 
-   hb_retl( bRet ? ( dwModemStat & MS_RLSD_ON ) != 0 : FALSE ); /* The RLSD (receive-line-signal-detect) signal is on. Also is DCD. */
+   hb_retl( bRet ? ( dwModemStat & MS_RLSD_ON ) != 0 : HB_FALSE ); /* The RLSD (receive-line-signal-detect) signal is on. Also is DCD. */
 }
 
 HB_FUNC( __TP_ISRI )
@@ -173,7 +173,7 @@ HB_FUNC( __TP_ISRI )
    DWORD dwModemStat = 0;
    BOOL bRet = GetCommModemStatus( ( HANDLE ) ( HB_PTRUINT ) hb_parnint( 1 ), &dwModemStat );
 
-   hb_retl( bRet ? ( dwModemStat & MS_RING_ON ) != 0 : FALSE );
+   hb_retl( bRet ? ( dwModemStat & MS_RING_ON ) != 0 : HB_FALSE );
 }
 
 HB_FUNC( __TP_ISDSR )
@@ -181,7 +181,7 @@ HB_FUNC( __TP_ISDSR )
    DWORD dwModemStat = 0;
    BOOL bRet = GetCommModemStatus( ( HANDLE ) ( HB_PTRUINT ) hb_parnint( 1 ), &dwModemStat );
 
-   hb_retl( bRet ? ( dwModemStat & MS_DSR_ON ) != 0 : FALSE );
+   hb_retl( bRet ? ( dwModemStat & MS_DSR_ON ) != 0 : HB_FALSE );
 }
 
 HB_FUNC( __TP_ISCTS )
@@ -189,7 +189,7 @@ HB_FUNC( __TP_ISCTS )
    DWORD dwModemStat = 0;
    BOOL bRet = GetCommModemStatus( ( HANDLE ) ( HB_PTRUINT ) hb_parnint( 1 ), &dwModemStat );
 
-   hb_retl( bRet ? ( dwModemStat & MS_CTS_ON ) != 0 : FALSE );
+   hb_retl( bRet ? ( dwModemStat & MS_CTS_ON ) != 0 : HB_FALSE );
 }
 
 #endif /* HB_OS_WIN */
diff --git a/harbour/contrib/xpp/dbcmdx.c b/harbour/contrib/xpp/dbcmdx.c
index 32409f2e3d..127a0c0b5a 100644
--- a/harbour/contrib/xpp/dbcmdx.c
+++ b/harbour/contrib/xpp/dbcmdx.c
@@ -80,7 +80,7 @@ HB_FUNC( ORDWILDSEEK )
 
       if( szPattern )
       {
-         BOOL fCont = hb_parl( 2 ), fBack = hb_parl( 3 ), fFound = FALSE;
+         HB_BOOL fCont = hb_parl( 2 ), fBack = hb_parl( 3 ), fFound = HB_FALSE;
          DBORDERINFO OrderInfo;
          HB_ERRCODE errCode = HB_SUCCESS;
 
@@ -131,7 +131,7 @@ HB_FUNC( DBSKIPPER )
    {
       LONG lSkipped = 0;
       LONG lRecs = 1;
-      BOOL fBEof;
+      HB_BOOL fBEof;
       ULONG ulRecords = 0;
 
       if( SELF_RECCOUNT( pArea, &ulRecords ) == HB_SUCCESS && ulRecords > 0 )
diff --git a/harbour/contrib/xpp/mousex.c b/harbour/contrib/xpp/mousex.c
index b45c8120af..8f61f2a730 100644
--- a/harbour/contrib/xpp/mousex.c
+++ b/harbour/contrib/xpp/mousex.c
@@ -61,7 +61,7 @@ HB_FUNC( NUMBUTTONS )
 
 HB_FUNC( SETMOUSE )
 {
-   BOOL fRow, fCol;
+   HB_BOOL fRow, fCol;
 
    hb_retl( hb_mouseGetCursor() );
 
diff --git a/harbour/src/rdd/dbcmdx.c b/harbour/src/rdd/dbcmdx.c
index 80aef982cf..786d9e7311 100644
--- a/harbour/src/rdd/dbcmdx.c
+++ b/harbour/src/rdd/dbcmdx.c
@@ -82,7 +82,7 @@ HB_FUNC( ORDWILDSEEK )
 
       if( szPattern )
       {
-         BOOL fCont = hb_parl( 2 ), fBack = hb_parl( 3 ), fFound = FALSE;
+         HB_BOOL fCont = hb_parl( 2 ), fBack = hb_parl( 3 ), fFound = HB_FALSE;
          DBORDERINFO OrderInfo;
          HB_ERRCODE errCode = HB_SUCCESS;
 
@@ -133,7 +133,7 @@ HB_FUNC( DBSKIPPER )
    {
       LONG lSkipped = 0;
       LONG lRecs = 1;
-      BOOL fBEof;
+      HB_BOOL fBEof;
       ULONG ulRecords = 0;
 
       if( SELF_RECCOUNT( pArea, &ulRecords ) == HB_SUCCESS && ulRecords > 0 )
diff --git a/harbour/src/rtl/mousex.c b/harbour/src/rtl/mousex.c
index 1bc55aa412..5693347ee3 100644
--- a/harbour/src/rtl/mousex.c
+++ b/harbour/src/rtl/mousex.c
@@ -65,7 +65,7 @@ HB_FUNC( NUMBUTTONS )
 
 HB_FUNC( SETMOUSE )
 {
-   BOOL fRow, fCol;
+   HB_BOOL fRow, fCol;
 
    hb_retl( hb_mouseGetCursor() );