diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a29fb651c2..c5d9e8d104 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,13 +17,40 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-14 20:09 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbct/ctnet.c
+    * Code cleanup.
+
+  * contrib/hbct/bitnum.c
+  * contrib/hbct/screen2.c
+  * contrib/hbct/token2.c
+  * contrib/hbct/ctnet.c
+  * contrib/hbct/ctwin.c
+  * contrib/hbct/ctwin.h
+  * contrib/hbct/files.c
+  * contrib/hbct/video.c
+  * contrib/hbct/dattime3.c
+  * contrib/hbct/screen1.c
+  * contrib/hbct/token1.c
+  * contrib/hbct/numcount.c
+  * contrib/hbct/ctwfunc.c
+  * contrib/hbct/setrc.c
+  * contrib/hbct/blank.c
+  * contrib/hbct/disk.c
+  * contrib/hbct/ctstrfil.c
+  * contrib/hbct/ctstrfil.h
+  * contrib/hbct/dattime2.c
+    * BOOL  -> HB_BOOL
+    * TRUE  -> HB_TRUE
+    * FALSE -> HB_FALSE
+
 2010-01-14 10:08 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/hbide.prg
   * contrib/hbide/idedocks.prg
   * contrib/hbide/ideeditor.prg
   * contrib/hbide/ideprojmanager.prg
   * contrib/hbide/idesources.prg
-    ! Updated to latest Harbour standards : 
+    ! Updated to latest Harbour standards :
          Method Definition == Method Declaration.
 
 2010-01-14 10:03 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
diff --git a/harbour/contrib/hbct/bitnum.c b/harbour/contrib/hbct/bitnum.c
index 50fd5e8e32..691140c6d0 100644
--- a/harbour/contrib/hbct/bitnum.c
+++ b/harbour/contrib/hbct/bitnum.c
@@ -56,7 +56,7 @@
 
 #include "hbapi.h"
 
-static BOOL __numParam( int iParam, HB_LONG * plNum )
+static HB_BOOL __numParam( int iParam, HB_LONG * plNum )
 {
    const char *szHex = hb_parc( iParam );
 
@@ -81,16 +81,16 @@ static BOOL __numParam( int iParam, HB_LONG * plNum )
          iParam = 0;
       }
       if( !iParam )
-         return TRUE;
+         return HB_TRUE;
    }
    else if( HB_ISNUM( iParam ) )
    {
       *plNum = hb_parnint( iParam );
-      return TRUE;
+      return HB_TRUE;
    }
 
    *plNum = -1;
-   return FALSE;
+   return HB_FALSE;
 }
 
 HB_FUNC( NUMAND )
@@ -291,7 +291,7 @@ HB_FUNC( INTNEG )
 
    if( __numParam( 1, &lValue ) )
    {
-      BOOL f32Bit = hb_parl( 2 );
+      HB_BOOL f32Bit = hb_parl( 2 );
 
       if( f32Bit )
          hb_retnint( ( INT16 ) lValue );
@@ -308,7 +308,7 @@ HB_FUNC( INTPOS )
 
    if( __numParam( 1, &lValue ) )
    {
-      BOOL f32Bit = hb_parl( 2 );
+      HB_BOOL f32Bit = hb_parl( 2 );
 
       if( f32Bit )
          hb_retnint( ( UINT16 ) lValue );
diff --git a/harbour/contrib/hbct/blank.c b/harbour/contrib/hbct/blank.c
index 07cd4caafa..9861fd7db7 100644
--- a/harbour/contrib/hbct/blank.c
+++ b/harbour/contrib/hbct/blank.c
@@ -58,13 +58,13 @@
 HB_FUNC( BLANK )
 {
    PHB_ITEM pItem = hb_param( 1, HB_IT_ANY );
-   BOOL bRef = HB_ISBYREF( 1 );
-   BOOL bRet = ! ct_getref();
+   HB_BOOL bRef = HB_ISBYREF( 1 );
+   HB_BOOL bRet = ! ct_getref();
 
    if( ! pItem )
    {
       if( bRet )
-         hb_retl( FALSE );
+         hb_retl( HB_FALSE );
    }
    else if( HB_IS_DATE( pItem ) )
    {
@@ -115,14 +115,14 @@ HB_FUNC( BLANK )
    else if( HB_IS_LOGICAL( pItem ) )
    {
       if( bRef )
-         hb_storl( FALSE, 1 );
+         hb_storl( HB_FALSE, 1 );
       if( bRet )
-         hb_retl( FALSE );
+         hb_retl( HB_FALSE );
    }
    else
    {
       if( bRet )
-         hb_retl( FALSE );
+         hb_retl( HB_FALSE );
    }
    if( ! bRet )
       hb_ret();
diff --git a/harbour/contrib/hbct/ctnet.c b/harbour/contrib/hbct/ctnet.c
index 348243eaac..7dc732c853 100644
--- a/harbour/contrib/hbct/ctnet.c
+++ b/harbour/contrib/hbct/ctnet.c
@@ -113,11 +113,12 @@ BOOL WINAPI WNetErrorHandler( DWORD dwErrorCode, LPSTR lpszFunction )
    else
    {
       DWORD dwLastError, dwWNetResult;
-      TCHAR lpDescription[256], lpProvider[256];
+      TCHAR lpDescription[ 256 ], lpProvider[ 256 ];
       char * szDescription, * szProvider;
 
-      dwWNetResult = WNetGetLastError( &dwLastError, lpDescription, 256,
-                                       lpProvider, 256 );
+      dwWNetResult = WNetGetLastError( &dwLastError,
+                                       lpDescription, HB_SIZEOFARRAY( lpDescription ),
+                                       lpProvider, HB_SIZEOFARRAY( lpProvider ) );
 
       if( dwWNetResult != NO_ERROR )
       {
@@ -126,7 +127,7 @@ BOOL WINAPI WNetErrorHandler( DWORD dwErrorCode, LPSTR lpszFunction )
                                 ( HB_ERRCODE ) dwWNetResult, EF_NONE );
          hb_errLaunch( pError );
          hb_itemRelease( pError );
-         return FALSE;
+         return HB_FALSE;
       }
 
       szDescription = HB_TCHAR_CONVFROM( lpDescription );
@@ -141,18 +142,18 @@ BOOL WINAPI WNetErrorHandler( DWORD dwErrorCode, LPSTR lpszFunction )
       hb_itemRelease( pError );
    }
 
-   return TRUE;
+   return HB_TRUE;
 }
 
-static BOOL hb_IsNetShared( const char *szLocalDevice )
+static HB_BOOL hb_IsNetShared( const char *szLocalDevice )
 {
-   TCHAR lpRemoteDevice[80];
+   TCHAR lpRemoteDevice[ 80 ];
    LPTSTR lpLocalDevice;
-   DWORD cchBuff = sizeof( lpRemoteDevice ) / sizeof( TCHAR );
+   DWORD cchBuff = HB_SIZEOFARRAY( lpRemoteDevice );
    DWORD dwResult;
 
    lpLocalDevice = HB_TCHAR_CONVTO( szLocalDevice );
-   dwResult = WNetGetConnection( ( LPTSTR ) lpLocalDevice,
+   dwResult = WNetGetConnection( ( LPCTSTR ) lpLocalDevice,
                                  ( LPTSTR ) lpRemoteDevice, &cchBuff );
    HB_TCHAR_FREE( lpLocalDevice );
 
@@ -202,7 +203,7 @@ HB_FUNC( NETREDIR )
    LPTSTR lpLocalDev  = HB_TCHAR_CONVTO( hb_parcx( 1 ) );
    LPTSTR lpSharedRes = HB_TCHAR_CONVTO( hb_parcx( 2 ) );
    LPTSTR lpPassword  = HB_TCHAR_CONVTO( hb_parcx( 3 ) );
-   BOOL bShowError = hb_parl( 4 );
+   HB_BOOL bShowError = hb_parl( 4 );
 
    if( hb_pcount() >= 3 && HB_ISCHAR( 3 ) )
       dwResult = WNetAddConnection( lpSharedRes, lpPassword, lpLocalDev );
@@ -210,25 +211,25 @@ HB_FUNC( NETREDIR )
       dwResult = WNetAddConnection( lpSharedRes, NULL, lpLocalDev );
 
    if( dwResult == NO_ERROR )
-      hb_retl( TRUE );
+      hb_retl( HB_TRUE );
    else
    {
       if( bShowError )
       {
-         char szCommand[80];
-         hb_snprintf( szCommand, 80, "NETREDIR( \"%s\", \"%s\", \"%s\" )",
+         char szCommand[ 80 ];
+         hb_snprintf( szCommand, sizeof( szCommand ), "NETREDIR( \"%s\", \"%s\", \"%s\" )",
                    hb_parcx( 1 ), hb_parcx( 2 ), hb_parcx( 3 ) );
          WNetErrorHandler( dwResult, szCommand );
       }
-      hb_retl( FALSE );
+      hb_retl( HB_FALSE );
    }
 }
 
 HB_FUNC( NETRMTNAME )
 {
-   TCHAR lpRemoteDevice[80];
+   TCHAR lpRemoteDevice[ 80 ];
    LPTSTR lpLocalDevice;
-   DWORD cchBuff = sizeof( lpRemoteDevice ) / sizeof( TCHAR );
+   DWORD cchBuff = HB_SIZEOFARRAY( lpRemoteDevice );
    DWORD dwResult;
    char *szRemoteDevice;
 
@@ -245,8 +246,8 @@ HB_FUNC( NETRMTNAME )
 HB_FUNC( NETWORK )
 {
    DWORD dwResult;
-   TCHAR lpProviderName[80];
-   DWORD cchBuff = sizeof( lpProviderName ) / sizeof( TCHAR );
+   TCHAR lpProviderName[ 80 ];
+   DWORD cchBuff = HB_SIZEOFARRAY( lpProviderName );
 
    dwResult = WNetGetProviderName( WNNC_NET_MSNET, lpProviderName, &cchBuff );
 
@@ -265,8 +266,8 @@ HB_FUNC( NETWORK )
 HB_FUNC( NNETWORK )
 {
    DWORD dwResult;
-   TCHAR lpProviderName[80];
-   DWORD cchBuff = sizeof( lpProviderName ) / sizeof( TCHAR );
+   TCHAR lpProviderName[ 80 ];
+   DWORD cchBuff = HB_SIZEOFARRAY( lpProviderName );
 
    dwResult = WNetGetProviderName( WNNC_NET_NETWARE, lpProviderName, &cchBuff );
 
diff --git a/harbour/contrib/hbct/ctstrfil.c b/harbour/contrib/hbct/ctstrfil.c
index 424977eb2f..7485abd89f 100644
--- a/harbour/contrib/hbct/ctstrfil.c
+++ b/harbour/contrib/hbct/ctstrfil.c
@@ -59,7 +59,7 @@
 #include "ctstrfil.h"
 
 static int s_iFileAttr = HB_FA_NORMAL;
-static BOOL s_bSafety = 0;
+static HB_BOOL s_bSafety = 0;
 
 void ct_setfcreate( int iFileAttr )
 {
@@ -81,13 +81,13 @@ HB_FUNC( SETFCREATE )
       ct_setfcreate( hb_parni( 1 ) );
 }
 
-void ct_setsafety( BOOL bSafety )
+void ct_setsafety( HB_BOOL bSafety )
 {
    HB_TRACE( HB_TR_DEBUG, ( "ct_setsafety(%i)", bSafety ) );
    s_bSafety = bSafety;
 }
 
-BOOL ct_getsafety( void )
+HB_BOOL ct_getsafety( void )
 {
    HB_TRACE( HB_TR_DEBUG, ( "ct_getsafety()" ) );
    return s_bSafety;
@@ -101,18 +101,18 @@ HB_FUNC( CSETSAFETY )
       ct_setsafety( hb_parnl( 1 ) );
 }
 
-static LONG ct_StrFile( const char * pFileName, const char * pcStr, ULONG ulLen, BOOL bOverwrite, LONG lOffset,
-                        BOOL bTrunc )
+static LONG ct_StrFile( const char * pFileName, const char * pcStr, ULONG ulLen, HB_BOOL bOverwrite, LONG lOffset,
+                        HB_BOOL bTrunc )
 {
    HB_FHANDLE hFile;
-   BOOL bOpen = FALSE;
-   BOOL bFile = hb_fsFile( pFileName );
+   HB_BOOL bOpen = HB_FALSE;
+   HB_BOOL bFile = hb_fsFile( pFileName );
    ULONG ulWrite = 0;
 
    if( bFile && bOverwrite )
    {
       hFile = hb_fsOpen( pFileName, FO_READWRITE );
-      bOpen = TRUE;
+      bOpen = HB_TRUE;
    }
    else if( !bFile || !ct_getsafety() )
       hFile = hb_fsCreate( pFileName, ct_getfcreate() );
@@ -158,7 +158,7 @@ HB_FUNC( FILESTR )
          LONG lFileSize = hb_fsSeek( hFile, 0, FS_END );
          LONG lPos = hb_fsSeek( hFile, hb_parnl( 3 ), FS_SET ), lLength;
          char *pcResult, *pCtrlZ;
-         BOOL bCtrlZ = hb_parl( 4 );
+         HB_BOOL bCtrlZ = hb_parl( 4 );
 
          if( HB_ISNUM( 2 ) )
          {
diff --git a/harbour/contrib/hbct/ctstrfil.h b/harbour/contrib/hbct/ctstrfil.h
index 96098ae0b5..42f3e00d26 100644
--- a/harbour/contrib/hbct/ctstrfil.h
+++ b/harbour/contrib/hbct/ctstrfil.h
@@ -55,8 +55,8 @@
 
 HB_EXTERN_BEGIN
 
-extern BOOL ct_getsafety( void );
-extern void ct_setsafety( BOOL bSafety );
+extern HB_BOOL ct_getsafety( void );
+extern void ct_setsafety( HB_BOOL bSafety );
 
 HB_EXTERN_END
 
diff --git a/harbour/contrib/hbct/ctwfunc.c b/harbour/contrib/hbct/ctwfunc.c
index c5598d4bdc..1c4afa7f1c 100644
--- a/harbour/contrib/hbct/ctwfunc.c
+++ b/harbour/contrib/hbct/ctwfunc.c
@@ -241,7 +241,7 @@ HB_FUNC( WFORMAT )
 
    if( hb_pcount() == 0 )
    {
-      hb_ctwGetFormatCords( iWindow, TRUE, &iTop, &iLeft, &iBottom, &iRight );
+      hb_ctwGetFormatCords( iWindow, HB_TRUE, &iTop, &iLeft, &iBottom, &iRight );
       iTop    = -iTop;
       iLeft   = -iLeft;
       iBottom = -iBottom;
diff --git a/harbour/contrib/hbct/ctwin.c b/harbour/contrib/hbct/ctwin.c
index ee83022be1..a811f1fe67 100644
--- a/harbour/contrib/hbct/ctwin.c
+++ b/harbour/contrib/hbct/ctwin.c
@@ -94,7 +94,7 @@ typedef struct
 {
    int iHandle;
 
-   BOOL fHidden;
+   HB_BOOL fHidden;
    int iLevel;
 
    int iShadowAttr;
@@ -108,7 +108,7 @@ typedef struct
    int iBottomMargin;
    int iRightMargin;
 
-   BOOL fClip;
+   HB_BOOL fClip;
    int iCliTop;
    int iCliLeft;
    int iCliBottom;
@@ -235,7 +235,7 @@ static void hb_ctw_TouchLines( PHB_GTCTW pCTW, int iFrom, int iTo )
    }
 }
 
-static void hb_ctw_WindowMap( PHB_GTCTW pCTW, int iWindow, BOOL fExpose )
+static void hb_ctw_WindowMap( PHB_GTCTW pCTW, int iWindow, HB_BOOL fExpose )
 {
    PHB_CT_WND pWnd;
 
@@ -284,7 +284,7 @@ static void hb_ctw_RemapAllWindows( PHB_GTCTW pCTW, int iFrom )
 
       hb_ctw_ClearMap( pCTW );
       for( i = iFrom; i < pCTW->iOpenWindows; ++i )
-         hb_ctw_WindowMap( pCTW, pCTW->windowStack[ i ], FALSE );
+         hb_ctw_WindowMap( pCTW, pCTW->windowStack[ i ], HB_FALSE );
       hb_ctw_TouchLines( pCTW, 0, pCTW->iMapHeight );
    }
 }
@@ -355,7 +355,7 @@ static int hb_ctw_SetWindowBoard( PHB_GTCTW pCTW, int iTop, int iLeft, int iBott
       pCTW->iBoardLeft    = iLeft;
       pCTW->iBoardBottom  = iBottom;
       pCTW->iBoardRight   = iRight;
-      pCTW->fBoardSet     = TRUE;
+      pCTW->fBoardSet     = HB_TRUE;
       hb_ctw_RemapAllWindows( pCTW, 0 );
 
       return 0;
@@ -403,7 +403,7 @@ static int hb_ctw_CurrentWindow( PHB_GTCTW pCTW )
    return pTSD->iCurrWindow;
 }
 
-static int hb_ctw_SelectWindow( PHB_GTCTW pCTW, int iWindow, BOOL fToTop )
+static int hb_ctw_SelectWindow( PHB_GTCTW pCTW, int iWindow, HB_BOOL fToTop )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_ctw_SelectWindow(%p,%d,%d)", pCTW, iWindow, fToTop));
 
@@ -439,7 +439,7 @@ static int hb_ctw_SelectWindow( PHB_GTCTW pCTW, int iWindow, BOOL fToTop )
                   if( i < pCTW->iOpenWindows - 1 )
                      hb_ctw_RemapAllWindows( pCTW, i );
                   else
-                     hb_ctw_WindowMap( pCTW, iWindow, TRUE );
+                     hb_ctw_WindowMap( pCTW, iWindow, HB_TRUE );
                }
                break;
             }
@@ -481,7 +481,7 @@ static int hb_ctw_Visible( PHB_GTCTW pCTW, int iWindow, int iVisible )
 static int hb_ctw_SetWindowLevel( PHB_GTCTW pCTW, int iWindow, int iLevel )
 {
    int iResult = -1, iPos, i;
-   BOOL fToTop;
+   HB_BOOL fToTop;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_ctw_SetWindowLevel(%p,%d,%d)", pCTW, iWindow, iLevel));
 
@@ -578,7 +578,7 @@ static int hb_ctw_MaxWindow( PHB_GTCTW pCTW )
    return iMaxHandle;
 }
 
-static int hb_ctw_CreateWindow( PHB_GTCTW pCTW, int iTop, int iLeft, int iBottom, int iRight, BOOL fClear, int iColor, BOOL fVisible )
+static int hb_ctw_CreateWindow( PHB_GTCTW pCTW, int iTop, int iLeft, int iBottom, int iRight, HB_BOOL fClear, int iColor, HB_BOOL fVisible )
 {
    PHB_CT_WND pWnd;
    BYTE bAttr;
@@ -673,7 +673,7 @@ static int hb_ctw_CreateWindow( PHB_GTCTW pCTW, int iTop, int iLeft, int iBottom
                                     pWnd->iWidth * sizeof( HB_SCREENCELL ) );
 
    if( pWnd->iShadowAttr >= 0 )
-      fClear = TRUE;
+      fClear = HB_TRUE;
    bAttr  = 0;
    if( iColor < 0 )
       iColor = HB_GTSELF_GETCOLOR( pCTW->pGT );
@@ -720,7 +720,7 @@ static int hb_ctw_CreateWindow( PHB_GTCTW pCTW, int iTop, int iLeft, int iBottom
       if( iTmp < pCTW->iOpenWindows - 1 )
          hb_ctw_RemapAllWindows( pCTW, iTmp );
       else
-         hb_ctw_WindowMap( pCTW, pWnd->iHandle, TRUE );
+         hb_ctw_WindowMap( pCTW, pWnd->iHandle, HB_TRUE );
    }
 
    return pWnd->iHandle;
@@ -734,7 +734,7 @@ static int hb_ctw_CloseWindow( PHB_GTCTW pCTW, int iWindow )
    {
       PHB_CT_WND pWnd = pCTW->windows[ iWindow ];
       int i, iWnd, iLast;
-      BOOL fHidden = pWnd->fHidden;
+      HB_BOOL fHidden = pWnd->fHidden;
 
       hb_xfree( pWnd->screenBuffer );
       if( pWnd->iColorCount )
@@ -799,7 +799,7 @@ static int hb_ctw_CloseAllWindows( PHB_GTCTW pCTW )
    return -1;
 }
 
-static int hb_ctw_CenterWindow( PHB_GTCTW pCTW, int iWindow, BOOL fCenter )
+static int hb_ctw_CenterWindow( PHB_GTCTW pCTW, int iWindow, HB_BOOL fCenter )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_ctw_CenterWindow(%p,%d,%d)", pCTW, iWindow, (int) fCenter));
 
@@ -931,11 +931,11 @@ static int hb_ctw_SetWindowClip( PHB_GTCTW pCTW, int iWindow, int iTop, int iLef
              ( iTop == 0 && iLeft == 0 &&
                iBottom == pWnd->iHeight - 1 && iRight == pWnd->iWidth -1 ) )
          {
-            pWnd->fClip      = FALSE;
+            pWnd->fClip      = HB_FALSE;
          }
          else
          {
-            pWnd->fClip      = TRUE;
+            pWnd->fClip      = HB_TRUE;
             pWnd->iCliTop    = iTop;
             pWnd->iCliLeft   = iLeft;
             pWnd->iCliBottom = iBottom;
@@ -948,7 +948,7 @@ static int hb_ctw_SetWindowClip( PHB_GTCTW pCTW, int iWindow, int iTop, int iLef
    return -1;
 }
 
-static int hb_ctw_GetWindowCords( PHB_GTCTW pCTW, int iWindow, BOOL fCenter, int * piTop, int * piLeft, int * piBottom, int * piRight )
+static int hb_ctw_GetWindowCords( PHB_GTCTW pCTW, int iWindow, HB_BOOL fCenter, int * piTop, int * piLeft, int * piBottom, int * piRight )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_ctw_GetWindowCords(%p,%d,%d,%p,%p,%p,%p)", pCTW, iWindow, (int) fCenter, piTop, piLeft, piBottom, piRight));
 
@@ -990,7 +990,7 @@ static int hb_ctw_GetWindowCords( PHB_GTCTW pCTW, int iWindow, BOOL fCenter, int
    return -1;
 }
 
-static int hb_ctw_GetFormatCords( PHB_GTCTW pCTW, int iWindow, BOOL fRelative, int * piTop, int * piLeft, int * piBottom, int * piRight )
+static int hb_ctw_GetFormatCords( PHB_GTCTW pCTW, int iWindow, HB_BOOL fRelative, int * piTop, int * piLeft, int * piBottom, int * piRight )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_ctw_GetFormatCords(%p,%d,%d,%p,%p,%p,%p)", pCTW, iWindow, (int) fRelative, piTop, piLeft, piBottom, piRight));
 
@@ -1072,7 +1072,7 @@ static int hb_ctw_SwapWindows( PHB_GTCTW pCTW, int iWindow1, int iWindow2 )
    {
       PHB_CT_WND pWnd;
       int iLevel;
-      BOOL fHidden;
+      HB_BOOL fHidden;
 
       pWnd = pCTW->windows[ iWindow1 ];
       pCTW->windows[ iWindow1 ] = pCTW->windows[ iWindow2 ];
@@ -1321,8 +1321,8 @@ static int hb_ctw_gt_MaxRow( PHB_GT pGT )
 static void hb_ctw_gt_WriteCon( PHB_GT pGT, const char * pText, ULONG ulLength )
 {
    int iLen = 0;
-   BOOL bDisp = FALSE;
-   BOOL bBell = FALSE;
+   HB_BOOL bDisp = HB_FALSE;
+   HB_BOOL bBell = HB_FALSE;
    int iRow, iCol, iMaxRow, iMaxCol;
    char szString[ WRITECON_BUFFER_SIZE ];
 
@@ -1357,20 +1357,20 @@ static void hb_ctw_gt_WriteCon( PHB_GT pGT, const char * pText, ULONG ulLength )
       switch( ch )
       {
          case HB_CHAR_BEL:
-            bDisp = bBell = TRUE;
+            bDisp = bBell = HB_TRUE;
             break;
 
          case HB_CHAR_BS:
             if( iCol > 0 )
             {
                --iCol;
-               bDisp = TRUE;
+               bDisp = HB_TRUE;
             }
             else if( iRow > 0 )
             {
                iCol = iMaxCol;
                --iRow;
-               bDisp = TRUE;
+               bDisp = HB_TRUE;
             }
             if( bDisp )
             {
@@ -1387,7 +1387,7 @@ static void hb_ctw_gt_WriteCon( PHB_GT pGT, const char * pText, ULONG ulLength )
          case HB_CHAR_LF:
             iCol = 0;
             ++iRow;
-            bDisp = TRUE;
+            bDisp = HB_TRUE;
             break;
 
          case HB_CHAR_CR:
@@ -1398,7 +1398,7 @@ static void hb_ctw_gt_WriteCon( PHB_GT pGT, const char * pText, ULONG ulLength )
                ++pText;
                --ulLength;
             }
-            bDisp = TRUE;
+            bDisp = HB_TRUE;
             break;
 
          default:
@@ -1407,10 +1407,10 @@ static void hb_ctw_gt_WriteCon( PHB_GT pGT, const char * pText, ULONG ulLength )
             {
                iCol = 0;
                ++iRow;
-               bDisp = TRUE;
+               bDisp = HB_TRUE;
             }
             else if( iLen >= WRITECON_BUFFER_SIZE )
-               bDisp = TRUE;
+               bDisp = HB_TRUE;
       }
 
       if( bDisp || ulLength == 0 )
@@ -1429,7 +1429,7 @@ static void hb_ctw_gt_WriteCon( PHB_GT pGT, const char * pText, ULONG ulLength )
             iCol = 0;
          }
          HB_GTSELF_SETPOS( pGT, iRow, iCol );
-         bDisp = FALSE;
+         bDisp = HB_FALSE;
 
          /* To emulate scrolling */
          HB_GTSELF_FLUSH( pGT );
@@ -1437,7 +1437,7 @@ static void hb_ctw_gt_WriteCon( PHB_GT pGT, const char * pText, ULONG ulLength )
          if( bBell )
          {
             HB_GTSELF_BELL( pGT );
-            bBell = FALSE;
+            bBell = HB_FALSE;
          }
       }
    }
@@ -1617,8 +1617,8 @@ static void hb_ctw_gt_GetScrCursor( PHB_GT pGT, int * piRow, int * piCol, int *
    }
 }
 
-static BOOL hb_ctw_gt_GetScrChar( PHB_GT pGT, int iRow, int iCol,
-                                  int * piColor, BYTE * pbAttr, USHORT * pusChar )
+static HB_BOOL hb_ctw_gt_GetScrChar( PHB_GT pGT, int iRow, int iCol,
+                                     int * piColor, BYTE * pbAttr, USHORT * pusChar )
 {
    PHB_GTCTW pCTW;
    int iWindow, iShadow;
@@ -1649,10 +1649,10 @@ static BOOL hb_ctw_gt_GetScrChar( PHB_GT pGT, int iRow, int iCol,
          *pbAttr  = pWnd->screenBuffer[ lIndex ].c.bAttr;
       }
       else
-         return FALSE;
+         return HB_FALSE;
    }
    else if( ! HB_GTSUPER_GETSCRCHAR( pGT, iRow, iCol, piColor, pbAttr, pusChar ) )
-      return FALSE;
+      return HB_FALSE;
 
    if( iShadow > 0 )
    {
@@ -1672,11 +1672,11 @@ static BOOL hb_ctw_gt_GetScrChar( PHB_GT pGT, int iRow, int iCol,
       *pbAttr |= HB_GT_ATTR_SHADOW;
    }
 
-   return TRUE;
+   return HB_TRUE;
 }
 
-static BOOL hb_ctw_gt_GetChar( PHB_GT pGT, int iRow, int iCol,
-                               int * piColor, BYTE * pbAttr, USHORT * pusChar )
+static HB_BOOL hb_ctw_gt_GetChar( PHB_GT pGT, int iRow, int iCol,
+                                  int * piColor, BYTE * pbAttr, USHORT * pusChar )
 {
    PHB_GTCTW pCTW;
    PHB_CT_WND pWnd;
@@ -1700,14 +1700,14 @@ static BOOL hb_ctw_gt_GetChar( PHB_GT pGT, int iRow, int iCol,
       *pusChar = pWnd->screenBuffer[ lIndex ].c.usChar;
       *piColor = pWnd->screenBuffer[ lIndex ].c.bColor;
       *pbAttr  = pWnd->screenBuffer[ lIndex ].c.bAttr;
-      return TRUE;
+      return HB_TRUE;
    }
 
-   return FALSE;
+   return HB_FALSE;
 }
 
-static BOOL hb_ctw_gt_PutChar( PHB_GT pGT, int iRow, int iCol,
-                               int iColor, BYTE bAttr, USHORT usChar )
+static HB_BOOL hb_ctw_gt_PutChar( PHB_GT pGT, int iRow, int iCol,
+                                  int iColor, BYTE bAttr, USHORT usChar )
 {
    PHB_GTCTW pCTW;
    int iWindow, iCurrWindow;
@@ -1745,7 +1745,7 @@ static BOOL hb_ctw_gt_PutChar( PHB_GT pGT, int iRow, int iCol,
                if( HB_GTSELF_GETSCRCHAR( pGT, iRow, iCol, &iClr, &bAtr, &usCh ) )
                {
                   if( usCh == usChar && iClr == iColor )
-                     return TRUE;
+                     return HB_TRUE;
                }
             }
          }
@@ -1769,7 +1769,7 @@ static BOOL hb_ctw_gt_PutChar( PHB_GT pGT, int iRow, int iCol,
       else if( pWnd->fClip &&
                ( iRow < pWnd->iCliTop    || iCol < pWnd->iCliLeft ||
                  iRow > pWnd->iCliBottom || iCol > pWnd->iCliRight ) )
-         return TRUE;
+         return HB_TRUE;
       else
       {
          iWndRow = iRow + pWnd->iTopMargin;
@@ -1796,15 +1796,15 @@ static BOOL hb_ctw_gt_PutChar( PHB_GT pGT, int iRow, int iCol,
                HB_GTSELF_TOUCHLINE( pGT, iRow );
             }
          }
-         return TRUE;
+         return HB_TRUE;
       }
-      return FALSE;
+      return HB_FALSE;
    }
 
    return HB_GTSUPER_PUTCHAR( pGT, iRow, iCol, iColor, bAttr, usChar );
 }
 
-static BOOL hb_ctw_gt_Resize( PHB_GT pGT, int iRows, int iCols )
+static HB_BOOL hb_ctw_gt_Resize( PHB_GT pGT, int iRows, int iCols )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_ctw_gt_Resize(%p,%d,%d)", pGT, iRows, iCols));
 
@@ -1825,26 +1825,26 @@ static BOOL hb_ctw_gt_Resize( PHB_GT pGT, int iRows, int iCols )
       }
       if( pCTW->fBoardSet )
          hb_ctw_SetWindowBoard( pCTW, 0, 0, iRows - 1, iCols - 1 );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
-static BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
+static HB_BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_ctw_gt_Info(%p,%d,%p)", pGT, iType, pInfo));
 
    switch ( iType )
    {
       case HB_GTI_ISCTWIN:
-         pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
+         pInfo->pResult = hb_itemPutL( pInfo->pResult, HB_TRUE );
          break;
 
       case HB_GTI_NEWWIN:
       {
-         BOOL fResult;
+         HB_BOOL fResult;
 
-         hb_ctw_SelectWindow( HB_GTCTW_GET( pGT ), 0, TRUE );
+         hb_ctw_SelectWindow( HB_GTCTW_GET( pGT ), 0, HB_TRUE );
          fResult = HB_GTSUPER_INFO( pGT, iType, pInfo );
 
          if( fResult && hb_arrayLen( pInfo->pResult ) >= 8 )
@@ -1856,11 +1856,11 @@ static BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
       }
       case HB_GTI_GETWIN:
       {
-         BOOL fResult;
+         HB_BOOL fResult;
          PHB_GTCTW pCTW = HB_GTCTW_GET( pGT );
          int iWindow = HB_CTW_GETCURRENT( pCTW );
 
-         hb_ctw_SelectWindow( pCTW, 0, TRUE );
+         hb_ctw_SelectWindow( pCTW, 0, HB_TRUE );
          fResult = HB_GTSUPER_INFO( pGT, iType, pInfo );
          if( fResult && hb_arrayLen( pInfo->pResult ) >= 8 )
             hb_arraySetNI( pInfo->pResult, 8, iWindow );
@@ -1868,21 +1868,21 @@ static BOOL hb_ctw_gt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
       }
       case HB_GTI_SETWIN:
       {
-         BOOL fResult;
+         HB_BOOL fResult;
          PHB_GTCTW pCTW = HB_GTCTW_GET( pGT );
 
-         hb_ctw_SelectWindow( pCTW, 0, TRUE );
+         hb_ctw_SelectWindow( pCTW, 0, HB_TRUE );
          fResult = HB_GTSUPER_INFO( pGT, iType, pInfo );
          if( fResult && hb_arrayLen( pInfo->pNewVal ) >= 8 )
             hb_ctw_SelectWindow( pCTW, hb_arrayGetNI( pInfo->pNewVal, 8 ),
-                                 TRUE );
+                                 HB_TRUE );
          return fResult;
       }
       default:
          return HB_GTSUPER_INFO( pGT, iType, pInfo );
    }
 
-   return TRUE;
+   return HB_TRUE;
 }
 
 static int hb_ctw_gt_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
@@ -1897,11 +1897,11 @@ static int hb_ctw_gt_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
    if( HB_IS_STRING( pMessage ) && iOptions > 0 )
    {
       int iRows, iCols;
-      BOOL fScreen;
+      HB_BOOL fScreen;
 
       HB_GTSELF_GETSIZE( pGT, &iRows, &iCols );
       if( iCols <= 4 || iRows <= 4 )
-         fScreen = FALSE;
+         fScreen = HB_FALSE;
       else
       {
          HB_GT_INFO gtInfo;
@@ -1912,7 +1912,7 @@ static int hb_ctw_gt_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
          if( gtInfo.pResult )
          {
             if( !hb_itemGetL( gtInfo.pResult ) )
-               fScreen = FALSE;
+               fScreen = HB_FALSE;
             hb_itemRelease( gtInfo.pResult );
          }
       }
@@ -1968,7 +1968,7 @@ static int hb_ctw_gt_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
             HB_GTSELF_DISPBEGIN( pGT );
 
          iPrevWnd = hb_ctw_CurrentWindow( pCTW );
-         iWnd = hb_ctw_CreateWindow( pCTW, iTop, iLeft, iBottom, iRight, TRUE, iClrNorm, TRUE );
+         iWnd = hb_ctw_CreateWindow( pCTW, iTop, iLeft, iBottom, iRight, HB_TRUE, iClrNorm, HB_TRUE );
          hb_ctw_AddWindowBox( pCTW, iWnd, _B_SINGLE, iClrNorm );
          HB_GTSELF_SETCURSORSTYLE( pGT, SC_NONE );
          ulLast = 0;
@@ -2016,7 +2016,7 @@ static int hb_ctw_gt_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
                HB_GTSELF_DISPEND( pGT );
             HB_GTSELF_REFRESH( pGT );
 
-            iKey = HB_GTSELF_INKEYGET( pGT, TRUE, dDelay, INKEY_ALL );
+            iKey = HB_GTSELF_INKEYGET( pGT, HB_TRUE, dDelay, INKEY_ALL );
             /* TODO: add support for SET KEY blocks */
 
             if( iKey == K_ESC )
@@ -2074,7 +2074,7 @@ static int hb_ctw_gt_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
          }
 
          hb_ctw_CloseWindow( pCTW, iWnd );
-         hb_ctw_SelectWindow( pCTW, iPrevWnd, TRUE );
+         hb_ctw_SelectWindow( pCTW, iPrevWnd, HB_TRUE );
          HB_GTSELF_REFRESH( pGT );
 
          while( HB_GTSELF_DISPCOUNT( pGT ) < iDspCount )
@@ -2154,16 +2154,16 @@ static void hb_ctw_gt_RedrawDiff( PHB_GT pGT )
                }
                while( ++l <= r );
             }
-            pGT->pLines[ i ] = FALSE;
+            pGT->pLines[ i ] = HB_FALSE;
          }
       }
-      pGT->fRefresh = FALSE;
+      pGT->fRefresh = HB_FALSE;
    }
 }
 
 /* PUBLIC FUNCTIONS */
 
-BOOL hb_ctwInit( void )
+HB_BOOL hb_ctwInit( void )
 {
    PHB_GTCTW pCTW = hb_ctw_base();
    if( pCTW )
@@ -2232,7 +2232,7 @@ int  hb_ctwSetBorderMode( int iTop, int iLeft, int iBottom, int iRight )
    return iResult;
 }
 
-int  hb_ctwCreateWindow( int iTop, int iLeft, int iBottom, int iRight, BOOL fClear, int iColor, BOOL fVisible )
+int  hb_ctwCreateWindow( int iTop, int iLeft, int iBottom, int iRight, HB_BOOL fClear, int iColor, HB_BOOL fVisible )
 {
    int iResult = -1;
    PHB_GTCTW pCTW = hb_ctw_base();
@@ -2283,7 +2283,7 @@ int  hb_ctwCurrentWindow( void )
    return iResult;
 }
 
-int  hb_ctwSelectWindow( int iWindow, BOOL fToTop )
+int  hb_ctwSelectWindow( int iWindow, HB_BOOL fToTop )
 {
    int iResult = 0;
    PHB_GTCTW pCTW = hb_ctw_base();
@@ -2372,7 +2372,7 @@ int  hb_ctwSetWindowClip( int iWindow, int iTop, int iLeft, int iBottom, int iRi
    return iResult;
 }
 
-int  hb_ctwGetWindowCords( int iWindow, BOOL fCenter, int * piTop, int * piLeft, int * piBottom, int * piRight )
+int  hb_ctwGetWindowCords( int iWindow, HB_BOOL fCenter, int * piTop, int * piLeft, int * piBottom, int * piRight )
 {
    int iResult = -1;
    PHB_GTCTW pCTW = hb_ctw_base();
@@ -2384,7 +2384,7 @@ int  hb_ctwGetWindowCords( int iWindow, BOOL fCenter, int * piTop, int * piLeft,
    return iResult;
 }
 
-int  hb_ctwGetFormatCords( int iWindow, BOOL fRelative, int * piTop, int * piLeft, int * piBottom, int * piRight )
+int  hb_ctwGetFormatCords( int iWindow, HB_BOOL fRelative, int * piTop, int * piLeft, int * piBottom, int * piRight )
 {
    int iResult = -1;
    PHB_GTCTW pCTW = hb_ctw_base();
@@ -2409,7 +2409,7 @@ int  hb_ctwMoveWindow( int iWindow, int iRow, int iCol )
    return iResult;
 }
 
-int  hb_ctwCenterWindow( int iWindow, BOOL fCenter )
+int  hb_ctwCenterWindow( int iWindow, HB_BOOL fCenter )
 {
    int iResult = -1;
    PHB_GTCTW pCTW = hb_ctw_base();
@@ -2482,7 +2482,7 @@ int  hb_ctwLastKey( void )
    return iResult;
 }
 
-static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
+static HB_BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_gt_FuncInit(%p)", pFuncTable));
 
@@ -2511,7 +2511,7 @@ static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
    pFuncTable->ReadKey                    = hb_ctw_gt_ReadKey;
    pFuncTable->RedrawDiff                 = hb_ctw_gt_RedrawDiff;
 
-   return TRUE;
+   return HB_TRUE;
 }
 
 /* *********************************************************************** */
diff --git a/harbour/contrib/hbct/ctwin.h b/harbour/contrib/hbct/ctwin.h
index c6e89adc1e..325f89654e 100644
--- a/harbour/contrib/hbct/ctwin.h
+++ b/harbour/contrib/hbct/ctwin.h
@@ -68,31 +68,31 @@
 
 HB_EXTERN_BEGIN
 
-extern BOOL hb_ctwInit( void );
-extern int  hb_ctwSetShadowAttr( int iAttr );
-extern int  hb_ctwSetMoveMode( int iMode );
-extern int  hb_ctwSetMoveStep( int iVertical, int iHorizontal );
-extern int  hb_ctwSetWindowBoard( int iTop, int iLeft, int iBottom, int iRight );
-extern int  hb_ctwSetBorderMode( int iTop, int iLeft, int iBottom, int iRight );
-extern int  hb_ctwCreateWindow( int iTop, int iLeft, int iBottom, int iRight, BOOL fClear, int iColor, BOOL fVisible );
-extern int  hb_ctwCloseAllWindows( void );
-extern int  hb_ctwCloseWindow( int iWindow );
-extern int  hb_ctwCurrentWindow( void );
-extern int  hb_ctwSelectWindow( int iWindow, BOOL fToTop );
-extern int  hb_ctwVisible( int iWindow, int iVisible );
-extern int  hb_ctwSetWindowShadow( int iWindow, int iAttr );
-extern int  hb_ctwSetWindowLevel( int iWindow, int iLevel );
-extern int  hb_ctwMaxWindow( void );
-extern int  hb_ctwChangeMargins( int iWindow, int iTop, int iLeft, int iBottom, int iRight );
-extern int  hb_ctwSetWindowClip( int iWindow, int iTop, int iLeft, int iBottom, int iRight );
-extern int  hb_ctwGetWindowCords( int iWindow, BOOL fCenter, int * piTop, int * piLeft, int * piBottom, int * piRight );
-extern int  hb_ctwGetFormatCords( int iWindow, BOOL fRelative, int * piTop, int * piLeft, int * piBottom, int * piRight );
-extern int  hb_ctwMoveWindow( int iWindow, int iRow, int iCol );
-extern int  hb_ctwCenterWindow( int iWindow, BOOL fCenter );
-extern int  hb_ctwAddWindowBox( int iWindow, const char * szBox, int iColor );
-extern int  hb_ctwSwapWindows( int iWindow1, int iWindow2 );
-extern int  hb_ctwGetPosWindow( int iRow, int iCol );
-extern int  hb_ctwLastKey( void );
+extern HB_BOOL hb_ctwInit( void );
+extern int     hb_ctwSetShadowAttr( int iAttr );
+extern int     hb_ctwSetMoveMode( int iMode );
+extern int     hb_ctwSetMoveStep( int iVertical, int iHorizontal );
+extern int     hb_ctwSetWindowBoard( int iTop, int iLeft, int iBottom, int iRight );
+extern int     hb_ctwSetBorderMode( int iTop, int iLeft, int iBottom, int iRight );
+extern int     hb_ctwCreateWindow( int iTop, int iLeft, int iBottom, int iRight, HB_BOOL fClear, int iColor, HB_BOOL fVisible );
+extern int     hb_ctwCloseAllWindows( void );
+extern int     hb_ctwCloseWindow( int iWindow );
+extern int     hb_ctwCurrentWindow( void );
+extern int     hb_ctwSelectWindow( int iWindow, HB_BOOL fToTop );
+extern int     hb_ctwVisible( int iWindow, int iVisible );
+extern int     hb_ctwSetWindowShadow( int iWindow, int iAttr );
+extern int     hb_ctwSetWindowLevel( int iWindow, int iLevel );
+extern int     hb_ctwMaxWindow( void );
+extern int     hb_ctwChangeMargins( int iWindow, int iTop, int iLeft, int iBottom, int iRight );
+extern int     hb_ctwSetWindowClip( int iWindow, int iTop, int iLeft, int iBottom, int iRight );
+extern int     hb_ctwGetWindowCords( int iWindow, HB_BOOL fCenter, int * piTop, int * piLeft, int * piBottom, int * piRight );
+extern int     hb_ctwGetFormatCords( int iWindow, HB_BOOL fRelative, int * piTop, int * piLeft, int * piBottom, int * piRight );
+extern int     hb_ctwMoveWindow( int iWindow, int iRow, int iCol );
+extern int     hb_ctwCenterWindow( int iWindow, HB_BOOL fCenter );
+extern int     hb_ctwAddWindowBox( int iWindow, const char * szBox, int iColor );
+extern int     hb_ctwSwapWindows( int iWindow1, int iWindow2 );
+extern int     hb_ctwGetPosWindow( int iRow, int iCol );
+extern int     hb_ctwLastKey( void );
 
 HB_EXTERN_END
 
diff --git a/harbour/contrib/hbct/dattime2.c b/harbour/contrib/hbct/dattime2.c
index a52835f72c..44a016c0aa 100644
--- a/harbour/contrib/hbct/dattime2.c
+++ b/harbour/contrib/hbct/dattime2.c
@@ -70,13 +70,13 @@
 #include "hbset.h"
 
 
-static BOOL ct_isleap( int iYear )
+static HB_BOOL ct_isleap( int iYear )
 {
    return iYear != 0 && ( ( ( iYear & 3 ) == 0 && iYear % 100 != 0 ) ||
                           iYear % 400 == 0 );
 }
 
-static int ct_daysinmonth( int iMonth, BOOL bLeap )
+static int ct_daysinmonth( int iMonth, HB_BOOL bLeap )
 {
    if( iMonth == 2 )
       return bLeap ? 29 : 28;
@@ -86,7 +86,7 @@ static int ct_daysinmonth( int iMonth, BOOL bLeap )
       return 31;
 }
 
-static int ct_daystomonth( int iMonth, BOOL bLeap )
+static int ct_daystomonth( int iMonth, HB_BOOL bLeap )
 {
    static const int iMonthes[] =
                { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
@@ -233,7 +233,7 @@ HB_FUNC( CTOMONTH )
 HB_FUNC( DMY )
 {
    int iYear, iMonth, iDay;
-   BOOL bMode = FALSE;
+   HB_BOOL bMode = HB_FALSE;
 
    if( HB_ISDATETIME( 1 ) )
    {
@@ -416,7 +416,7 @@ HB_FUNC( ADDMONTH )
 {
    long lJulian, lMillisec = 0;
    int iYear, iMonth, iDay, iNum, iDays;
-   BOOL fTimeStamp = FALSE;
+   HB_BOOL fTimeStamp = HB_FALSE;
 
    if( HB_ISNUM( 1 ) )
    {
@@ -427,7 +427,7 @@ HB_FUNC( ADDMONTH )
    {
       if( HB_ISTIMESTAMP( 1 ) )
       {
-         fTimeStamp = TRUE;
+         fTimeStamp = HB_TRUE;
          hb_partdt( &lJulian, &lMillisec, 1 );
          hb_dateDecode( lJulian, &iYear, &iMonth, &iDay );
       }
@@ -587,7 +587,7 @@ HB_FUNC( ISLEAP )
 HB_FUNC( DAYSTOMONTH )
 {
    int iMonth = hb_parni( 1 );
-   BOOL bLeap = hb_parl( 2 );
+   HB_BOOL bLeap = hb_parl( 2 );
 
    hb_retni( ct_daystomonth( iMonth, bLeap ) );
 }
@@ -623,7 +623,7 @@ HB_FUNC( DAYSTOMONTH )
 HB_FUNC( DAYSINMONTH )
 {
    int iMonth = hb_parni( 1 );
-   BOOL bLeap = hb_parl( 2 );
+   HB_BOOL bLeap = hb_parl( 2 );
 
    hb_retni( ct_daysinmonth( iMonth, bLeap ) );
 
@@ -707,7 +707,7 @@ HB_FUNC( QUARTER )
  */
 HB_FUNC( LASTDAYOM )
 {
-   BOOL bLeap = FALSE;
+   HB_BOOL bLeap = HB_FALSE;
    int iYear, iMonth, iDay;
 
    if( HB_ISNUM( 1 ) )
@@ -838,7 +838,7 @@ HB_FUNC( WEEK )
 {
    int iYear, iMonth, iDay, iWeek;
    long lDate;
-   BOOL bSWN = hb_parl( 2 );
+   HB_BOOL bSWN = hb_parl( 2 );
 
    if( HB_ISDATETIME( 1 ) )
    {
diff --git a/harbour/contrib/hbct/dattime3.c b/harbour/contrib/hbct/dattime3.c
index e3416a2f01..117a4b9388 100644
--- a/harbour/contrib/hbct/dattime3.c
+++ b/harbour/contrib/hbct/dattime3.c
@@ -137,9 +137,9 @@ HB_FUNC( WAITPERIOD )
    hb_retl( d < s_dTimeCounter );
 }
 
-static BOOL _hb_timeValid( const char * szTime, ULONG ulLen, int * piDecode )
+static HB_BOOL _hb_timeValid( const char * szTime, ULONG ulLen, int * piDecode )
 {
-   BOOL fValid = FALSE;
+   HB_BOOL fValid = HB_FALSE;
 
    if( ulLen == 2 || ulLen == 5 || ulLen == 8 || ulLen == 11 )
    {
@@ -147,7 +147,7 @@ static BOOL _hb_timeValid( const char * szTime, ULONG ulLen, int * piDecode )
       int i, iVal;
       ULONG ul;
 
-      fValid = TRUE;
+      fValid = HB_TRUE;
       for( ul = 0; fValid && ul < ulLen; ++ul )
       {
          fValid = ul % 3 == 2 ? szTime[ul] == ':' :
@@ -285,7 +285,7 @@ HB_FUNC( TIMEVALID )
 
 HB_FUNC( SETTIME )
 {
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
    int iTime[4];
 
    iTime[0] = iTime[1] = iTime[2] = iTime[3] = 0;
@@ -367,7 +367,7 @@ HB_FUNC( SETTIME )
 
 HB_FUNC( SETDATE )
 {
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
    long lDate = hb_pardl( 1 );
 
    if( lDate )
diff --git a/harbour/contrib/hbct/disk.c b/harbour/contrib/hbct/disk.c
index f2ff72a2e0..1e6892f2cd 100644
--- a/harbour/contrib/hbct/disk.c
+++ b/harbour/contrib/hbct/disk.c
@@ -208,7 +208,7 @@ HB_FUNC( NUMDISKL )
 
 HB_FUNC( VOLUME )
 {
-   BOOL bReturn = FALSE;
+   HB_BOOL bReturn = HB_FALSE;
 
    if( !ct_getsafety() )
    {
diff --git a/harbour/contrib/hbct/files.c b/harbour/contrib/hbct/files.c
index 450cd10a69..dcadeefac8 100644
--- a/harbour/contrib/hbct/files.c
+++ b/harbour/contrib/hbct/files.c
@@ -114,7 +114,7 @@ static HB_TSD_NEW( s_FFData, sizeof( HB_FFDATA ), NULL, hb_fileFindRelease );
 #define HB_GET_FFDATA() ( ( PHB_FFDATA ) hb_stackGetTSD( &s_FFData ) )
 
 
-static PHB_FFIND _hb_fileStart( BOOL fNext, HB_FATTR ulAttr )
+static PHB_FFIND _hb_fileStart( HB_BOOL fNext, HB_FATTR ulAttr )
 {
    PHB_FFDATA pFFData = HB_GET_FFDATA();
 
@@ -168,7 +168,7 @@ static PHB_FFIND _hb_fileStart( BOOL fNext, HB_FATTR ulAttr )
 
 HB_FUNC( FILESEEK )
 {
-   PHB_FFIND ffind = _hb_fileStart( TRUE, HB_FA_ALL );
+   PHB_FFIND ffind = _hb_fileStart( HB_TRUE, HB_FA_ALL );
 
    hb_retc( ffind ? ffind->szName : NULL );
 }
@@ -179,28 +179,28 @@ HB_FUNC( FILEATTR )
     * attributes and because we are supporting more attributes
     * then I decided to use 0xffff value. [druzus]
     */
-   PHB_FFIND ffind = _hb_fileStart( FALSE, 0xffff );
+   PHB_FFIND ffind = _hb_fileStart( HB_FALSE, 0xffff );
 
    hb_retni( ffind ? ffind->attr : 0 );
 }
 
 HB_FUNC( FILESIZE )
 {
-   PHB_FFIND ffind = _hb_fileStart( FALSE, HB_FA_ALL );
+   PHB_FFIND ffind = _hb_fileStart( HB_FALSE, HB_FA_ALL );
 
    hb_retnint( ffind ? ffind->size : -1 );
 }
 
 HB_FUNC( FILEDATE )
 {
-   PHB_FFIND ffind = _hb_fileStart( FALSE, HB_FA_ALL );
+   PHB_FFIND ffind = _hb_fileStart( HB_FALSE, HB_FA_ALL );
 
    hb_retdl( ffind ? ffind->lDate : 0 );
 }
 
 HB_FUNC( FILETIME )
 {
-   PHB_FFIND ffind = _hb_fileStart( FALSE, HB_FA_ALL );
+   PHB_FFIND ffind = _hb_fileStart( HB_FALSE, HB_FA_ALL );
 
    hb_retc( ffind ? ffind->szTime : NULL );
 }
@@ -223,7 +223,7 @@ HB_FUNC( SETFATTR )
 HB_FUNC( SETFDATI )
 {
    const char *szFile = hb_parc( 1 );
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( szFile && *szFile )
    {
@@ -261,7 +261,7 @@ HB_FUNC( SETFDATI )
 
 HB_FUNC( FILEDELETE )
 {
-   BOOL bReturn = FALSE;
+   HB_BOOL bReturn = HB_FALSE;
 
    if( HB_ISCHAR( 1 ) )
    {
@@ -289,7 +289,7 @@ HB_FUNC( FILEDELETE )
             hb_fsFNameMerge( szPath, pFilepath );
 
             if( hb_fsDelete( szPath ) )
-               bReturn = TRUE;
+               bReturn = HB_TRUE;
          }
          while( hb_fsFindNext( ffind ) );
 
diff --git a/harbour/contrib/hbct/numcount.c b/harbour/contrib/hbct/numcount.c
index fcd28e8664..4d3b02d1e8 100644
--- a/harbour/contrib/hbct/numcount.c
+++ b/harbour/contrib/hbct/numcount.c
@@ -57,7 +57,7 @@ static LONG s_lCounter = 0;
 
 HB_FUNC( NUMCOUNT )
 {
-   BOOL bMode = hb_parl( 2 );
+   HB_BOOL bMode = hb_parl( 2 );
 
    if( HB_ISNUM( 1 ) )
    {
diff --git a/harbour/contrib/hbct/screen1.c b/harbour/contrib/hbct/screen1.c
index 41309b5d83..263c82575e 100644
--- a/harbour/contrib/hbct/screen1.c
+++ b/harbour/contrib/hbct/screen1.c
@@ -270,8 +270,8 @@ HB_FUNC( SAYSCREEN )
    hb_retc_null();
 }
 
-static BOOL hb_ctGetWinCord( int * piTop, int * piLeft,
-                             int * piBottom, int * piRight )
+static HB_BOOL hb_ctGetWinCord( int * piTop, int * piLeft,
+                                int * piBottom, int * piRight )
 {
    int iMaxRow = hb_gtMaxRow();
    int iMaxCol = hb_gtMaxCol();
@@ -552,7 +552,7 @@ HB_FUNC( CHARWIN )
    if( hb_ctGetWinCord( &iTop, &iLeft, &iBottom, &iRight ) )
    {
       USHORT usNewChar, usOldChar = 0;
-      BOOL fAll = FALSE;
+      HB_BOOL fAll = HB_FALSE;
 
       usNewChar = ( USHORT ) hb_ctGetClearChar( 5 );
 
@@ -561,7 +561,7 @@ HB_FUNC( CHARWIN )
       else if( hb_parclen( 6 ) > 0 )
          usOldChar = ( UCHAR ) hb_parc( 6 )[0];
       else
-         fAll = TRUE;
+         fAll = HB_TRUE;
 
       hb_gtBeginWrite();
       while( iTop <= iBottom )
@@ -634,14 +634,14 @@ HB_FUNC( COLORWIN )
    if( hb_ctGetWinCord( &iTop, &iLeft, &iBottom, &iRight ) )
    {
       int iNewColor, iOldColor = 0;
-      BOOL fAll = FALSE;
+      HB_BOOL fAll = HB_FALSE;
 
       iNewColor = hb_ctGetClearColor( 5 );
 
       if( HB_ISNUM( 6 ) || HB_ISCHAR( 6 ) )
          iOldColor = hb_ctGetClearColor( 6 );
       else
-         fAll = TRUE;
+         fAll = HB_TRUE;
 
       hb_gtBeginWrite();
       while( iTop <= iBottom )
@@ -765,14 +765,14 @@ HB_FUNC( COLORREPL )
    int iMaxCol = hb_gtMaxCol();
    int iRow = 0, iCol;
    int iNewColor, iOldColor = 0;
-   BOOL fAll = FALSE;
+   HB_BOOL fAll = HB_FALSE;
 
    iNewColor = hb_ctGetClearColor( 1 );
 
    if( HB_ISNUM( 2 ) || HB_ISCHAR( 2 ) )
       iOldColor = hb_ctGetClearColor( 2 );
    else
-      fAll = TRUE;
+      fAll = HB_TRUE;
 
    hb_gtBeginWrite();
    while( iRow <= iMaxRow )
diff --git a/harbour/contrib/hbct/screen2.c b/harbour/contrib/hbct/screen2.c
index 9f5796243b..0a015faabf 100644
--- a/harbour/contrib/hbct/screen2.c
+++ b/harbour/contrib/hbct/screen2.c
@@ -167,7 +167,7 @@ HB_FUNC( SAYMOVEIN )
       ULONG ulChars, ul;
       int iRow, iCol, iMaxRow, iMaxCol, iNewCol;
       long lDelay;
-      BOOL fBack;
+      HB_BOOL fBack;
 
       lDelay = HB_ISNUM( 2 ) ? hb_parnl( 2 ) : 4;
       fBack = hb_parl( 5 );
diff --git a/harbour/contrib/hbct/setrc.c b/harbour/contrib/hbct/setrc.c
index 0147886adc..a83f0a2c1e 100644
--- a/harbour/contrib/hbct/setrc.c
+++ b/harbour/contrib/hbct/setrc.c
@@ -54,7 +54,7 @@
 
 HB_FUNC( SETRC )
 {
-   BOOL fRow = HB_ISNUM( 1 ), fCol = HB_ISNUM( 2 );
+   HB_BOOL fRow = HB_ISNUM( 1 ), fCol = HB_ISNUM( 2 );
 
    if( fRow && fCol )
       hb_gtSetPos( hb_parni( 1 ), hb_parni( 2 ) );
diff --git a/harbour/contrib/hbct/token1.c b/harbour/contrib/hbct/token1.c
index d5e15e7e01..80e7372b7a 100644
--- a/harbour/contrib/hbct/token1.c
+++ b/harbour/contrib/hbct/token1.c
@@ -283,13 +283,13 @@ static void do_token1( int iSwitch )
             if( ulSkip == 0xFFFFFFFFUL )
             {
                const char *t;
-               BOOL bLast = TRUE;
+               HB_BOOL bLast = HB_TRUE;
 
                for( t = pc + 1; t < pcString + sStrLen; t++ )
                {
                   if( !memchr( pcSeparatorStr, *t, sSeparatorStrLen ) )
                   {
-                     bLast = FALSE;
+                     bLast = HB_FALSE;
                      break;
                   }
                }
diff --git a/harbour/contrib/hbct/token2.c b/harbour/contrib/hbct/token2.c
index 88c9c75db3..eab6e060b4 100644
--- a/harbour/contrib/hbct/token2.c
+++ b/harbour/contrib/hbct/token2.c
@@ -256,7 +256,7 @@ static const size_t ssSeparatorStrLen = 26;
 
 /* TODO: make thread safe */
 static TOKEN_ENVIRONMENT s_sTokenEnvironment = NULL;
-static BOOL s_fInit = FALSE;
+static HB_BOOL s_fInit = HB_FALSE;
 
 static void sTokExit( void * cargo )
 {
@@ -274,7 +274,7 @@ static void sTokSet( TOKEN_ENVIRONMENT env )
    if( !s_fInit && env )
    {
       hb_vmAtExit( sTokExit, NULL );
-      s_fInit = TRUE;
+      s_fInit = HB_TRUE;
    }
 
    if( s_sTokenEnvironment )
diff --git a/harbour/contrib/hbct/video.c b/harbour/contrib/hbct/video.c
index b357bcd901..8904aab660 100644
--- a/harbour/contrib/hbct/video.c
+++ b/harbour/contrib/hbct/video.c
@@ -153,7 +153,7 @@ HB_FUNC( VGAPALETTE )
    if( hb_pcount() < 4 )
    {
       /* Resetting palette registers to default values is not supported yet */
-      hb_retl( FALSE );
+      hb_retl( HB_FALSE );
       return;
    }
 
@@ -168,7 +168,7 @@ HB_FUNC( VGAPALETTE )
    if( attr < 0 || attr >= 16 )
    {
       /* An invalid argument */
-      hb_retl( FALSE );
+      hb_retl( HB_FALSE );
       return;
    }
 
@@ -201,9 +201,9 @@ HB_FUNC( VGAPALETTE )
       if( iflag )
          __dpmi_get_and_enable_virtual_interrupt_state();
    }
-   hb_retl( TRUE );
+   hb_retl( HB_TRUE );
 #   else
-   hb_retl( FALSE );
+   hb_retl( HB_FALSE );
 #   endif
 }