diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 14917d33f5..516129fdc2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,87 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-08-17 08:59 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * doc/dirstruc.txt
+     * Updated to reflect current state. [Chen Kedem]
+
+   * contrib/examples/pp/hbppcore.c
+   * contrib/examples/pp/pp.c
+   * contrib/hbct/disk.c
+   * contrib/hbct/files.c
+   * contrib/hbnf/getenvrn.c
+   * contrib/hbw32/tprinter.c
+   * contrib/hbziparch/hbxdirec.c
+   * contrib/hbziparch/hbziparc.c
+   * contrib/rddads/ads1.c
+   * contrib/rddads/adsfunc.c
+   * doc/en/terminal.txt
+   * include/hb_io.h
+   * include/hbapifs.h
+   * include/hbapirdd.h
+   * include/hbdefs.h
+   * include/hbsetup.h
+   * include/hbwince.h
+   * source/common/hbfsapi.c
+   * source/compiler/gencobj.c
+   * source/compiler/hbcomp.c
+   * source/compiler/hbusage.c
+   * source/debug/dbgentry.c
+   * source/main/harbour.c
+   * source/pp/hbpp.c
+   * source/pp/ppcore.c
+   * source/rdd/dbcmd.c
+   * source/rdd/dbf1.c
+   * source/rdd/delim1.c
+   * source/rdd/sdf1.c
+   * source/rdd/usrrdd/usrrdd.c
+   * source/rdd/wacore.c
+   * source/rdd/wafunc.c
+   * source/rdd/workarea.c
+   * source/rtl/console.c
+   * source/rtl/copyfile.c
+   * source/rtl/defpath.c
+   * source/rtl/direct.c
+   * source/rtl/disksphb.c
+   * source/rtl/file.c
+   * source/rtl/filesys.c
+   * source/rtl/fssize.c
+   * source/rtl/fstemp.c
+   * source/rtl/gtos2/gtos2.c
+   * source/rtl/gtpca/gtpca.c
+   * source/rtl/gtstd/gtstd.c
+   * source/rtl/gttrm/gttrm.c
+   * source/rtl/hbffind.c
+   * source/rtl/hbinet.c
+   * source/rtl/memofile.c
+   * source/rtl/philes.c
+   * source/rtl/seconds.c
+   * source/rtl/set.c
+   * source/vm/hvm.c
+   * source/vm/main.c
+     * Changed some macros to be in the HB_ namespace, to be 
+       possibly shorter, more unified and clearer.
+       OS_UNIX_COMPATIBLE                -> HB_OS_UNIX_COMPATIBLE
+       OS_PATH_LIST_SEPARATOR            -> HB_OS_PATH_LIST_SEP_CHR
+       OS_PATH_DELIMITER                 -> HB_OS_PATH_DELIM_CHR
+       OS_PATH_DELIMITER_STRING          -> HB_OS_PATH_DELIM_STR
+       OS_PATH_DELIMITER_LIST            -> HB_OS_PATH_DELIM_LIST
+       OS_FILE_MASK                      -> HB_OS_ALLFILE_MASK
+       OS_DRIVE_DELIMITER                -> HB_OS_DRIVE_DELIM_CHR
+       OS_HAS_DRIVE_LETTER               -> HB_OS_HAS_DRIVE_LETTER
+       OS_OPT_DELIMITER_LIST             -> HB_OS_OPT_DELIM_LIST
+       OS_EOL_LEN                        -> HB_OS_EOL_LEN
+       HARBOUR_GCC_OS2                   -> HB_OS_OS2_GCC
+       HARBOUR_START_PROCEDURE           -> HB_START_PROCEDURE
+       HARBOUR_MAIN_STD                  -> HB_MAIN_STD
+       HARBOUR_MAIN_WIN                  -> HB_MAIN_WIN
+       HARBOUR_MAX_RDD_DRIVERNAME_LENGTH -> HB_RDD_MAX_DRIVERNAME_LEN
+       HARBOUR_MAX_RDD_ALIAS_LENGTH      -> HB_RDD_MAX_ALIAS_LEN
+       HARBOUR_MAX_RDD_AREA_NUM          -> HB_RDD_MAX_AREA_NUM
+     ; INCOMPATIBLE change, please update your sources, a simple 
+       case-sensitive search and replace on .c/.cpp/.h/.hpp files 
+       will be enough for most sources.
+
 2008-08-16 16:16 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * make_b32.mak
    * make_gcc.mak
diff --git a/harbour/contrib/examples/pp/hbppcore.c b/harbour/contrib/examples/pp/hbppcore.c
index a783185dff..323364e70a 100644
--- a/harbour/contrib/examples/pp/hbppcore.c
+++ b/harbour/contrib/examples/pp/hbppcore.c
@@ -480,8 +480,8 @@ void hb_pp_Init( void )
 #endif
    }
 
-#ifdef HARBOUR_START_PROCEDURE
-   hb_pp_AddDefine_( "__HB_MAIN__", HARBOUR_START_PROCEDURE );
+#ifdef HB_START_PROCEDURE
+   hb_pp_AddDefine_( "__HB_MAIN__", HB_START_PROCEDURE );
 #endif
 }
 
diff --git a/harbour/contrib/examples/pp/pp.c b/harbour/contrib/examples/pp/pp.c
index a0f2cdf8d8..bd04344ce7 100644
--- a/harbour/contrib/examples/pp/pp.c
+++ b/harbour/contrib/examples/pp/pp.c
@@ -241,7 +241,7 @@ int main( int argc, char * argv[] )
         char * pDelim;
 
         pPath = szInclude;
-        while( ( pDelim = strchr( pPath, OS_PATH_LIST_SEPARATOR ) ) != NULL )
+        while( ( pDelim = strchr( pPath, HB_OS_PATH_LIST_SEP_CHR ) ) != NULL )
           {
             *pDelim = '\0';
             AddSearchPath( pPath, &hb_comp_pIncludePath );
@@ -530,7 +530,7 @@ BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree )
 
 int hb_setGetDirSeparator( void )
 {
-   return OS_PATH_DELIMITER;
+   return HB_OS_PATH_DELIM_CHR;
 }
 
 int hb_verSvnID( void )
diff --git a/harbour/contrib/hbct/disk.c b/harbour/contrib/hbct/disk.c
index 159b552660..31366ac7e0 100644
--- a/harbour/contrib/hbct/disk.c
+++ b/harbour/contrib/hbct/disk.c
@@ -102,7 +102,7 @@ HB_FUNC( DIRNAME )
 {
    BYTE *pbyBuffer = ( BYTE * ) hb_xgrab( _POSIX_PATH_MAX + 1 );
 
-   pbyBuffer[0] = OS_PATH_DELIMITER;
+   pbyBuffer[0] = HB_OS_PATH_DELIM_CHR;
    hb_fsCurDirBuff( hb_fsCurDrv(), pbyBuffer + 1, _POSIX_PATH_MAX );
 
    hb_retc_buffer( ( char * ) pbyBuffer );
diff --git a/harbour/contrib/hbct/files.c b/harbour/contrib/hbct/files.c
index 71cb973036..8784643965 100644
--- a/harbour/contrib/hbct/files.c
+++ b/harbour/contrib/hbct/files.c
@@ -83,7 +83,7 @@
 #  include <sys/farptr.h>
 #  include <sys/param.h>
 #endif
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
 #  include <sys/types.h>
 #  include <utime.h>
 #  include <unistd.h>
@@ -310,7 +310,7 @@ HB_FUNC( SETFDATI )
          hb_retl( ulrc == NO_ERROR );
          return;
       }
-#elif defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#elif defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
 
       if( !pDate && !pTime )
       {
diff --git a/harbour/contrib/hbnf/getenvrn.c b/harbour/contrib/hbnf/getenvrn.c
index 38e4feb927..8fdffc57da 100644
--- a/harbour/contrib/hbnf/getenvrn.c
+++ b/harbour/contrib/hbnf/getenvrn.c
@@ -98,7 +98,7 @@
 #define HB_OS_WIN_32_USED
 #include "hbapi.h"
 
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
 #   include <unistd.h>
 #   if defined( HB_OS_DARWIN )
 #      include <crt_externs.h>
@@ -127,7 +127,7 @@ HB_FUNC( FT_GETE )
    /* INTERNALS WARNING: All references to 'environ', strlen(), ;
       strcpy(), and strcat() are undocumented Clipper 5.0 internals.
     */
-#if defined(HB_OS_DOS) || defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_DOS) || defined(HB_OS_UNIX_COMPATIBLE)
    {
 
       char *buffer = NULL;
diff --git a/harbour/contrib/hbw32/tprinter.c b/harbour/contrib/hbw32/tprinter.c
index 9c31b9ceef..3f2065bdc3 100644
--- a/harbour/contrib/hbw32/tprinter.c
+++ b/harbour/contrib/hbw32/tprinter.c
@@ -92,7 +92,7 @@ BOOL hb_PrinterExists( LPSTR pPrinterName )
 
    HB_TRACE( HB_TR_DEBUG, ( "hb_PrinterExists(%s)", pPrinterName ) );
 
-   if( !strchr( pPrinterName, OS_PATH_LIST_SEPARATOR ) && !hb_isLegacyDevice( pPrinterName ) )
+   if( !strchr( pPrinterName, HB_OS_PATH_LIST_SEP_CHR ) && !hb_isLegacyDevice( pPrinterName ) )
 
    {                            // Don't bother with test if '\' in string
       if( hb_iswinnt() )
diff --git a/harbour/contrib/hbziparch/hbxdirec.c b/harbour/contrib/hbziparch/hbxdirec.c
index fb7f748081..e0ba3228c4 100644
--- a/harbour/contrib/hbziparch/hbxdirec.c
+++ b/harbour/contrib/hbziparch/hbxdirec.c
@@ -154,7 +154,7 @@ void HB_EXPORT hb_fsDirectory( PHB_ITEM pDir, char * szSkleton, char * szAttribu
    if ( szSkleton && strlen( szSkleton ) > 0 )
       szDirSpec = hb_fsNameConv( ( BYTE * ) szSkleton, &bAlloc );
    else
-      szDirSpec = ( BYTE * ) OS_FILE_MASK;
+      szDirSpec = ( BYTE * ) HB_OS_ALLFILE_MASK;
 
    if( bDirOnly || bFullPath )
    {
diff --git a/harbour/contrib/hbziparch/hbziparc.c b/harbour/contrib/hbziparch/hbziparc.c
index 683eed8e63..5df9953d42 100644
--- a/harbour/contrib/hbziparch/hbziparc.c
+++ b/harbour/contrib/hbziparch/hbziparc.c
@@ -332,14 +332,14 @@ static void ZipCreateArray( PHB_ITEM pParam, BYTE *pCurDir, BOOL bFullPath )
             PHB_FNAME fDirSpec = hb_fsFNameSplit( (char*) szArrEntry );
 
             if( ( pCurDir ) && ( fDirSpec != NULL ) &&
-                 ! ( fDirSpec->szDrive ) && ( fDirSpec->szPath ) && ( fDirSpec->szPath[0] != OS_PATH_DELIMITER ) )
+                 ! ( fDirSpec->szDrive ) && ( fDirSpec->szPath ) && ( fDirSpec->szPath[0] != HB_OS_PATH_DELIM_CHR ) )
          #else
             /* if don't gave path add current dir ! */
-            if( ( pCurDir ) && ( ! strchr( szArrEntry, OS_PATH_DELIMITER ) ) )
+            if( ( pCurDir ) && ( ! strchr( szArrEntry, HB_OS_PATH_DELIM_CHR ) ) )
          #endif
             {
                char * szTemp = szArrEntry ;
-               szArrEntry = hb_xstrcpy( NULL, (char *) pCurDir, OS_PATH_DELIMITER_STRING, szTemp, NULL );
+               szArrEntry = hb_xstrcpy( NULL, (char *) pCurDir, HB_OS_PATH_DELIM_CHR_STRING, szTemp, NULL );
                hb_xfree( szTemp );
             }
 
@@ -553,7 +553,7 @@ HB_FUNC( HB_ZIPFILE )
             return;
          }
 
-         pCurDir = ( BYTE * ) hb_xstrcpy( NULL, OS_PATH_DELIMITER_STRING, ( const char * )hb_fsCurDir( 0 ) , NULL );
+         pCurDir = ( BYTE * ) hb_xstrcpy( NULL, HB_OS_PATH_DELIM_CHR_STRING, ( const char * )hb_fsCurDir( 0 ) , NULL );
 
          /* Always needs to create an array */
          ZipCreateExclude( pExclude );
@@ -562,10 +562,10 @@ HB_FUNC( HB_ZIPFILE )
 
          hb_fsChDir( pCurDir );
 
-         if( ! strchr( hb_parc( 1 ), OS_PATH_DELIMITER ) )
+         if( ! strchr( hb_parc( 1 ), HB_OS_PATH_DELIM_CHR ) )
          {
             hb_strncpy( szFile, (char *) pCurDir, sizeof( szFile ) - 1 );
-            hb_strncat( szFile, OS_PATH_DELIMITER_STRING, sizeof( szFile ) - 1 );
+            hb_strncat( szFile, HB_OS_PATH_DELIM_CHR_STRING, sizeof( szFile ) - 1 );
             hb_strncat( szFile, hb_parc( 1 ), sizeof( szFile ) - 1 );
          }
          else
@@ -765,7 +765,7 @@ HB_FUNC( HB_ZIPFILEBYTDSPAN )
          #endif
          /* by JGS */
 
-         pCurDir = ( BYTE * )hb_xstrcpy( NULL, OS_PATH_DELIMITER_STRING, ( const char * )hb_fsCurDir( 0 ) , NULL );
+         pCurDir = ( BYTE * )hb_xstrcpy( NULL, HB_OS_PATH_DELIM_CHR_STRING, ( const char * )hb_fsCurDir( 0 ) , NULL );
 
          ZipCreateExclude( pExclude );
 
@@ -775,10 +775,10 @@ HB_FUNC( HB_ZIPFILEBYTDSPAN )
          /* by JGS, wait until adding the directory to the file name if not specified
          hb_xfree( pCurDir );
          */
-         if( ! strchr( szFile, OS_PATH_DELIMITER ) )
+         if( ! strchr( szFile, HB_OS_PATH_DELIM_CHR ) )
          {
             hb_strncpy( szFile, (char *) pCurDir, sizeof( szFile ) - 1 );
-            hb_strncat( szFile, OS_PATH_DELIMITER_STRING, sizeof( szFile ) - 1 );
+            hb_strncat( szFile, HB_OS_PATH_DELIM_CHR_STRING, sizeof( szFile ) - 1 );
             hb_strncat( szFile, hb_parc( 1 ), sizeof( szFile ) - 1 );
          }
          else
@@ -941,7 +941,7 @@ HB_FUNC( HB_ZIPFILEBYPKSPAN )
          #endif
          /* by JGS */
 
-         pCurDir = ( BYTE * )hb_xstrcpy( NULL, OS_PATH_DELIMITER_STRING, ( const char * )hb_fsCurDir( 0 ) , NULL );
+         pCurDir = ( BYTE * )hb_xstrcpy( NULL, HB_OS_PATH_DELIM_CHR_STRING, ( const char * )hb_fsCurDir( 0 ) , NULL );
 
          ZipCreateExclude( pExclude );
 
@@ -952,10 +952,10 @@ HB_FUNC( HB_ZIPFILEBYPKSPAN )
          hb_xfree( pCurDir );
          hb_strncpy( szFile, hb_parc( 1 ), sizeof( szFile ) - 1 );
          */
-         if( ! strchr( szFile, OS_PATH_DELIMITER ) )
+         if( ! strchr( szFile, HB_OS_PATH_DELIM_CHR ) )
          {
             hb_strncpy( szFile, (char *) pCurDir, sizeof( szFile ) - 1 );
-            hb_strncat( szFile, OS_PATH_DELIMITER_STRING, sizeof( szFile ) - 1 );
+            hb_strncat( szFile, HB_OS_PATH_DELIM_CHR_STRING, sizeof( szFile ) - 1 );
             hb_strncat( szFile, hb_parc( 1 ), sizeof( szFile ) - 1 );
          }
          else
@@ -1068,7 +1068,7 @@ HB_FUNC( HB_UNZIPFILE )
       char *szZipFileName;
       BYTE *pCurDir;
 
-      pCurDir = ( BYTE * ) hb_xstrcpy( NULL, OS_PATH_DELIMITER_STRING, ( const char * ) hb_fsCurDir( 0 ) , NULL );
+      pCurDir = ( BYTE * ) hb_xstrcpy( NULL, HB_OS_PATH_DELIM_CHR_STRING, ( const char * ) hb_fsCurDir( 0 ) , NULL );
 
       hb_strncpy( szFile, hb_parc( 1 ), sizeof( szFile ) - 1 );
 
diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c
index d17f3f099c..09bf8dc43d 100644
--- a/harbour/contrib/rddads/ads1.c
+++ b/harbour/contrib/rddads/ads1.c
@@ -2865,7 +2865,7 @@ static ERRCODE adsOpen( ADSAREAP pArea, LPDBOPENINFO pOpenInfo )
    /* See adsGettValue() for why we don't use pArea->uiMaxFieldNameLength here */
    UNSIGNED16 pusBufLen, pusType, pusDecimals;
    DBFIELDINFO dbFieldInfo;
-   char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ], * szFile;
+   char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ], * szFile;
    BOOL fDictionary = FALSE;
 
    HB_TRACE(HB_TR_DEBUG, ("adsOpen(%p)", pArea));
@@ -2962,7 +2962,7 @@ static ERRCODE adsOpen( ADSAREAP pArea, LPDBOPENINFO pOpenInfo )
    /* Set default alias if necessary */
    if( !pOpenInfo->atomAlias )
    {
-      UNSIGNED16 uiAliasLen = HARBOUR_MAX_RDD_ALIAS_LENGTH;
+      UNSIGNED16 uiAliasLen = HB_RDD_MAX_ALIAS_LEN;
       if( AdsGetTableAlias( hTable, ( UNSIGNED8 * ) szAlias, &uiAliasLen ) == AE_SUCCESS )
          pOpenInfo->atomAlias = ( BYTE * ) szAlias;
       else
@@ -3167,18 +3167,18 @@ static ERRCODE adsSysName( ADSAREAP pArea, BYTE * pBuffer )
    switch( u16TableType )
    {
       case ADS_NTX:
-         hb_strncpy( ( char * ) pBuffer, "ADSNTX", HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+         hb_strncpy( ( char * ) pBuffer, "ADSNTX", HB_RDD_MAX_DRIVERNAME_LEN );
          break;
       case ADS_CDX:
-         hb_strncpy( ( char * ) pBuffer, "ADSCDX", HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+         hb_strncpy( ( char * ) pBuffer, "ADSCDX", HB_RDD_MAX_DRIVERNAME_LEN );
          break;
 #if ADS_LIB_VERSION >= 900
       case ADS_VFP:
-         hb_strncpy( ( char * ) pBuffer, "ADSVFP", HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+         hb_strncpy( ( char * ) pBuffer, "ADSVFP", HB_RDD_MAX_DRIVERNAME_LEN );
          break;
 #endif
       case ADS_ADT:
-         hb_strncpy( ( char * ) pBuffer, "ADSADT", HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+         hb_strncpy( ( char * ) pBuffer, "ADSADT", HB_RDD_MAX_DRIVERNAME_LEN );
          break;
    }
 
diff --git a/harbour/contrib/rddads/adsfunc.c b/harbour/contrib/rddads/adsfunc.c
index b791ce21d5..387c7b704b 100644
--- a/harbour/contrib/rddads/adsfunc.c
+++ b/harbour/contrib/rddads/adsfunc.c
@@ -755,8 +755,8 @@ HB_FUNC( ADSGETTABLEALIAS )
 
    if( pArea )
    {
-      UNSIGNED8  pucAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
-      UNSIGNED16 pusLen = HARBOUR_MAX_RDD_ALIAS_LENGTH + 1;
+      UNSIGNED8  pucAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
+      UNSIGNED16 pusLen = HB_RDD_MAX_ALIAS_LEN + 1;
 
       if( AdsGetTableAlias( pArea->hTable,
                             pucAlias,
@@ -1169,10 +1169,10 @@ HB_FUNC( ADSCREATESQLSTATEMENT )
 
             if( pArea )
             {
-               char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+               char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
                hb_strncpy( szAlias, ISCHAR( 1 ) ? hb_parc( 1 ) : "ADSSQL",
-                           HARBOUR_MAX_RDD_ALIAS_LENGTH );
+                           HB_RDD_MAX_ALIAS_LEN );
                pArea->atomAlias = hb_rddAllocWorkAreaAlias( szAlias,
                                                             pArea->uiArea );
                if( pArea->atomAlias )
diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt
index f0f0dd73b1..f40fa3ed80 100644
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -53,6 +53,14 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |   +---misc        - A few humble demonstration.
 |   |   |
 |   |   +---pe          - Editor.
+|   |   |
+|   |   +---hbpp        - Harbour Preprocessor as a standalone module.
+|   |   |
+|   |   +---rdddbt      - DBFDBT RDD.
+|   |
+|   +---gtwvg           - GT subsystem for Win32 GUI using GDI functions.
+|   |   |
+|   |   +---tests       - Demo program and sample images.
 |   |
 |   +---hbapollo        - Wrapper functions for VistaSoftware's Apollo
 |   |   |                 database driver.
@@ -79,6 +87,10 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |   |
 |   |   +---tests       - Test programs.
 |   |
+|   +---hbcurl          - libcurl 'easy' API - Harbour interface.
+|   |   |
+|   |   +---tests       - Test programs.
+|   |
 |   +---hbfbird         - Harbour Low Level api for Firebird and Interbase
 |   |   |                 RDBMS.
 |   |   |
@@ -104,14 +116,14 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |
 |   +---hbgf            - Harbour GUI framework.
 |   |   |
-|   |   +---gtk         - Implementation for GTK+ environment.
+|   |   +---hbgfgtk     - Implementation for GTK+ environment.
 |   |   |
-|   |   +---os2pm       - Implementation for OS/2 Presentation Manager
+|   |   +---hbgfos2     - Implementation for OS/2 Presentation Manager
 |   |   |                 environment.
 |   |   |
-|   |   +---tests       - Test programs.
+|   |   +---hbgfw32     - Implementation for Win32 environment.
 |   |   |
-|   |   +---win32       - Implementation for Win32 environment.
+|   |   +---tests       - Test programs.
 |   |
 |   +---hbgt            - GT library port to Harbour.
 |   |   |
@@ -119,10 +131,6 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |       |
 |   |       +---en      - English documentation.
 |   |
-|   +---gtwvg           - GT subsystem for Win32 GUI using GDI functions.
-|   |   |
-|   |   +---tests       - Demo program and sample images.
-|   |
 |   +---hbmisc          - Miscellaneous contribution.
 |   |   |
 |   |   +---doc         - Documents for above contribution.
@@ -138,6 +146,12 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   +---hbmysql         - Harbour MySQL access classes.
 |   |   |
 |   |   +---tests       - Test program.
+|   |   |
+|   |   +---utils       - Converts a .dbf file into a MySQL table.
+|   |
+|   +---hbmzip          - Wrapper functions for minizip library.
+|   |   |
+|   |   +---tests       - Test programs.
 |   |
 |   +---hbnf            - Nanforum library port for Harbour.
 |   |   |
@@ -155,24 +169,30 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |   |
 |   |   +---tests       - Test programs.
 |   |
-|   +---rddado          - ADORDD - RDD to automatically manage Microsoft ADO.
+|   +---hbsqlit2        - Interface for SQLite 2.x library.
 |   |   |
 |   |   +---tests       - Test programs.
 |   |
-|   +---rddads          - RDD for Advantage Database Server.
+|   +---hbsqlit3        - Interface for SQLite 3.x library.
 |   |   |
-|   |   +---doc         - Documents for Advantage Database Server RDD.
-|   |   |   |
-|   |   |   +---en      - English documentation.
+|   |   +---sqlite3     - An amalgamation of SQLite core library.
 |   |   |
 |   |   +---tests       - Test programs.
 |   |
 |   +---hbtip           - TIP Class oriented Internet Protocol library.
+|   |   |
+|   |   +---tests       - Test programs.
 |   |
 |   +---hbtpathy        - Telepathy serial communication port for Harbour.
 |   |   |
 |   |   +---tests       - Test program.
 |   |
+|   +---hbvpdf          - PDF library written in PRG.
+|   |   |
+|   |   +---tests       - Test programs.
+|   |       |
+|   |       +---files   - Sample files for testing.
+|   |
 |   +---hbw32           - Collection of Win32 specific utility functions.
 |   |   |
 |   |   +---tests       - Test programs.
@@ -187,11 +207,22 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   +---hbziparch       - Interface for ZipArchive general purpose compression
 |   |   |                 library to work with ZIP files.
 |   |   |
-|   |   +---doc         - Documents for the ZIP functions.
+|   |   +---tests       - Test programs.
 |   |   |
-|   |   +---include     - Include files used by the library.
+|   |   +---zlib        - Stub to plug Harbour ZLIB without the need to
+|   |                     modify ZipArchive sources.
+|   |
+|   +---rddado          - ADORDD - RDD to automatically manage Microsoft ADO.
 |   |   |
-|   |   +---Linux       - Some source files for the Linux platform.
+|   |   +---tests       - Test programs.
+|   |
+|   +---rddads          - RDD for Advantage Database Server.
+|   |   |
+|   |   +---doc         - Documents for Advantage Database Server RDD.
+|   |   |   |
+|   |   |   +---en      - English documentation.
+|   |   |
+|   |   +---tests       - Test programs.
 |   |
 |   +---xhb             - xHarbour compatibility libarary. To allow programs
 |                         which where written using some xHarcour extensions,
@@ -231,9 +262,15 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |
 |   +---debug           - Debugger.
 |   |
+|   +---hbextern        - Library with all function binding available for
+|   |                     .prg code
+|   |
 |   +---hbpcre          - Harbour implementation of the Perl Compatible
 |   |                     Regular Expressions (PCRE) library.
 |   |
+|   +---hbzlib          - Harbour implementation of the ZLIB data
+|   |                     compression library.
+|   |
 |   +---lang            - National language message support files.
 |   |
 |   +---macro           - Macro compiler.
@@ -246,8 +283,6 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   |   |
 |   |   +---dbfcdx      - DBFCDX RDD.
 |   |   |
-|   |   +---dbfdbt      - DBFDBT RDD.
-|   |   |
 |   |   +---dbffpt      - DBFFPT RDD.
 |   |   |
 |   |   +---dbfntx      - DBFNTX RDD.
@@ -312,27 +347,22 @@ track of all files (read the FAQ if you don't know what SVN is).
 |   +---bldtest         - Simple C program to check if Harbour can be compiled
 |   |                     on the current machine, system and C compiler.
 |   |
+|   +---hbpptest        - Regression tests for the preprocessor.
+|   |
 |   +---multifnc        - Overloading C functions test.
 |
 +---utils               - Utilities and tools that are part of Harbour.
     |
     +---hbdoc           - Documentation generation tool.
     |
-    +---hbdot           - "DOt Prompt" console for the Harbour language.
-    |
     +---hbextern        - HBEXTERN.CH generator.
     |
     +---hbmake          - Harbour Make utility.
     |
-    +---hbpp            - Harbour Preprocessor as a standalone module.
-    |
-    +---hbpptest        - Regression tests for the preprocessor.
-    |
-    +---hbrun           - Standalone Harbour Portable Object file runner.
+    +---hbrun           - Standalone Harbour Portable Object file runner,
+    |                     and a "dot prompt" console for the Harbour language.
     |
     +---hbtest          - Regression tests for the Run-Time library.
-    |
-    +---hbver           - Harbour Version Updater.
 
 
 Legend:
diff --git a/harbour/doc/en/terminal.txt b/harbour/doc/en/terminal.txt
index 1416e1c0a8..cccd635efe 100644
--- a/harbour/doc/en/terminal.txt
+++ b/harbour/doc/en/terminal.txt
@@ -368,7 +368,7 @@
  *  $COMPLIANCE$
  *      This is an add-on Operating System Tool function.
  *  $PLATFORMS$
- *      Under OS_UNIX_COMPATIBLE operating system the return value is the
+ *      Under HB_OS_UNIX_COMPATIBLE operating system the return value is the
  *      Line-Feed (0x0a) character CHR(10), with other operating systems
  *      (like DOS) the return value is the Carriage-Return plus Line-Feed
  *      (0x0d 0x0a) characters CHR(13)+CHR(10).
diff --git a/harbour/include/hb_io.h b/harbour/include/hb_io.h
index 9436c62200..bfe19c4439 100644
--- a/harbour/include/hb_io.h
+++ b/harbour/include/hb_io.h
@@ -53,7 +53,7 @@
 #ifndef HB__IO_H_
 #define HB__IO_H_
 
-#if defined(OS_UNIX_COMPATIBLE) || \
+#if defined(HB_OS_UNIX_COMPATIBLE) || \
     ( defined(__GNUC__) && ! defined(__MINGW32__) )
    #include <unistd.h>
    #if defined(__DJGPP__) || defined(__CYGWIN__) || defined(__EMX__)
diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h
index b76b5e57cf..fb60aa18db 100644
--- a/harbour/include/hbapifs.h
+++ b/harbour/include/hbapifs.h
@@ -206,7 +206,7 @@ extern HB_EXPORT BOOL       hb_fsDirExists  ( const char * pszDirName ); /* chec
 #define hb_fsFLock( h, s, l )   hb_fsLock( h, s, l, FL_LOCK )
 #define hb_fsFUnlock( h, s, l ) hb_fsLock( h, s, l, FL_UNLOCK )
 
-#if defined( OS_UNIX_COMPATIBLE ) && !defined( HB_USE_SHARELOCKS_OFF )
+#if defined( HB_OS_UNIX_COMPATIBLE ) && !defined( HB_USE_SHARELOCKS_OFF )
 #  define HB_USE_SHARELOCKS
 #  define HB_SHARELOCK_POS          0x7fffffffUL
 #  define HB_SHARELOCK_SIZE         0x1UL
diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h
index 92efd0a367..240b7b6dab 100644
--- a/harbour/include/hbapirdd.h
+++ b/harbour/include/hbapirdd.h
@@ -60,14 +60,14 @@
 
 HB_EXTERN_BEGIN
 
-#define HARBOUR_MAX_RDD_DRIVERNAME_LENGTH          32
+#define HB_RDD_MAX_DRIVERNAME_LEN          32
 
-#ifndef HARBOUR_MAX_RDD_ALIAS_LENGTH
-   #define HARBOUR_MAX_RDD_ALIAS_LENGTH            32
+#ifndef HB_RDD_MAX_ALIAS_LEN
+   #define HB_RDD_MAX_ALIAS_LEN            32
 #endif
 
 /* #define HARBOUR_MAX_RDD_FIELDNAME_LENGTH        32 */
-#define HARBOUR_MAX_RDD_AREA_NUM                65535
+#define HB_RDD_MAX_AREA_NUM                65535
 
 /* DBCMD errors */
 
@@ -790,7 +790,7 @@ typedef RDDFUNCS * PRDDFUNCS;
 /* RDD Node structure              */
 typedef struct _RDDNODE
 {
-   char szName[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ]; /* Name of RDD */
+   char szName[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ]; /* Name of RDD */
    USHORT   uiType;           /* Type of RDD */
    USHORT   rddID;            /* Type of RDD */
    RDDFUNCS pTable;           /* Table of functions */
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 584c39fe93..8075f44531 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -1156,8 +1156,8 @@ typedef unsigned long HB_COUNTER;
  *
  * By default we are using automatic lookup (symbol not defined)
 */
-#if defined(__WATCOMC__) || defined(__DMC__) || ( defined(__GNUC__) && !defined(__DJGPP__) && !defined(HARBOUR_GCC_OS2) )
-   #define HARBOUR_START_PROCEDURE "MAIN"
+#if defined(__WATCOMC__) || defined(__DMC__) || ( defined(__GNUC__) && !defined(__DJGPP__) && !defined(HB_OS_OS2_GCC) )
+   #define HB_START_PROCEDURE "MAIN"
 #endif
 
 #if defined(HB_FUNC_CALLCONV)
diff --git a/harbour/include/hbsetup.h b/harbour/include/hbsetup.h
index 0e5248043b..507e3be0bf 100644
--- a/harbour/include/hbsetup.h
+++ b/harbour/include/hbsetup.h
@@ -165,8 +165,8 @@
  *
  * By default the standard C main() function will be used.
  */
-/* #define HARBOUR_MAIN_STD */
-/* #define HARBOUR_MAIN_WIN */
+/* #define HB_MAIN_STD */
+/* #define HB_MAIN_WIN */
 
 /* ***********************************************************************
  * You can set here the maximum symbol name length handled by Harbour
@@ -200,35 +200,35 @@
       ! ( defined(__DJGPP__) || defined(__EMX__) || defined(__RSXNT__) || \
           defined(_Windows) || defined(_WIN32) || defined(_WINCE) ) ) || \
     ( defined(__WATCOMC__) && defined(__LINUX__) )
-   #define OS_UNIX_COMPATIBLE
-   #define OS_PATH_LIST_SEPARATOR    ':'
-   #define OS_PATH_DELIMITER         '/'
-   #define OS_PATH_DELIMITER_STRING  "/"
-   #define OS_PATH_DELIMITER_LIST    "/"
-   #define OS_FILE_MASK              "*"
-   #undef  OS_DRIVE_DELIMITER
-   #undef  OS_HAS_DRIVE_LETTER
-   #define OS_OPT_DELIMITER_LIST     "-"
-   #define OS_EOL_LEN                1
+   #define HB_OS_UNIX_COMPATIBLE
+   #define HB_OS_PATH_LIST_SEP_CHR      ':'
+   #define HB_OS_PATH_DELIM_CHR         '/'
+   #define HB_OS_PATH_DELIM_CHR_STRING  "/"
+   #define HB_OS_PATH_DELIM_CHR_LIST    "/"
+   #define HB_OS_ALLFILE_MASK           "*"
+   #undef  HB_OS_DRIVE_DELIM_CHR
+   #undef  HB_OS_HAS_DRIVE_LETTER
+   #define HB_OS_OPT_DELIM_LIST         "-"
+   #define HB_OS_EOL_LEN                1
 #else
    /* we are assuming here the DOS compatible OS */
    #define OS_DOS_COMPATIBLE
-   #define OS_PATH_LIST_SEPARATOR    ';'
-   #define OS_PATH_DELIMITER         '\\'
-   #define OS_PATH_DELIMITER_STRING  "\\"
-   #define OS_PATH_DELIMITER_LIST    "\\/:"
-   #define OS_FILE_MASK              "*.*"
-   #define OS_DRIVE_DELIMITER        ':'
-   #define OS_HAS_DRIVE_LETTER
-   #define OS_OPT_DELIMITER_LIST     "/-"
-   #define OS_EOL_LEN                2  /* # of bytes in End of Line marker */
+   #define HB_OS_PATH_LIST_SEP_CHR      ';'
+   #define HB_OS_PATH_DELIM_CHR         '\\'
+   #define HB_OS_PATH_DELIM_CHR_STRING  "\\"
+   #define HB_OS_PATH_DELIM_CHR_LIST    "\\/:"
+   #define HB_OS_ALLFILE_MASK           "*.*"
+   #define HB_OS_DRIVE_DELIM_CHR        ':'
+   #define HB_OS_HAS_DRIVE_LETTER
+   #define HB_OS_OPT_DELIM_LIST         "/-"
+   #define HB_OS_EOL_LEN                2  /* # of bytes in End of Line marker */
 #endif
 
 #ifndef _POSIX_PATH_MAX
    #define _POSIX_PATH_MAX    255
 #endif
 
-#define HB_ISOPTSEP( c ) ( strchr( OS_OPT_DELIMITER_LIST, ( c ) ) != NULL )
+#define HB_ISOPTSEP( c ) ( strchr( HB_OS_OPT_DELIM_LIST, ( c ) ) != NULL )
 
 /* ***********************************************************************
  * Platform detection
@@ -265,11 +265,11 @@
  *  Detect GCC/OS2
  */
 #if defined(__EMX__) && ! defined(__RSXNT__)
-   #define HARBOUR_GCC_OS2
+   #define HB_OS_OS2_GCC
 #endif
 
 #ifndef HB_OS_OS2
-   #if defined(OS2) || defined(__OS2__) || defined(OS_2) || defined(HARBOUR_GCC_OS2)
+   #if defined(OS2) || defined(__OS2__) || defined(OS_2) || defined(HB_OS_OS2_GCC)
       #define HB_OS_OS2
       #if defined(__EMX__)
          #define HB_OS_OS2_EMX
@@ -328,7 +328,7 @@
 #endif
 
 #ifndef HB_OS_UNIX
-   #if defined(OS_UNIX_COMPATIBLE) || defined(HB_OS_LINUX) || \
+   #if defined(HB_OS_UNIX_COMPATIBLE) || defined(HB_OS_LINUX) || \
        defined(HB_OS_BSD) || defined(HB_OS_SUNOS) || defined(HB_OS_HPUX)
       #define HB_OS_UNIX
    #endif
@@ -347,8 +347,8 @@
  */
 /* #define HB_EOL_CRLF */
 #ifdef HB_EOL_CRLF
-   #undef OS_EOL_LEN
-   #define OS_EOL_LEN 2
+   #undef HB_OS_EOL_LEN
+   #define HB_OS_EOL_LEN 2
 #endif
 
 /* ***********************************************************************
diff --git a/harbour/include/hbwince.h b/harbour/include/hbwince.h
index b35e46872b..ad62d97504 100644
--- a/harbour/include/hbwince.h
+++ b/harbour/include/hbwince.h
@@ -58,7 +58,7 @@
 HB_EXTERN_BEGIN
 
 #if defined(HB_WINCE)
-#  undef  OS_HAS_DRIVE_LETTER
+#  undef  HB_OS_HAS_DRIVE_LETTER
 
 /* defined(__CEGCC__) || defined(__MINGW32CE__) */
 
diff --git a/harbour/source/common/hbfsapi.c b/harbour/source/common/hbfsapi.c
index d4a2bd1491..d819792ac8 100644
--- a/harbour/source/common/hbfsapi.c
+++ b/harbour/source/common/hbfsapi.c
@@ -99,7 +99,7 @@ HB_EXPORT void hb_fsAddSearchPath( const char * szPath, HB_PATHNAMES ** pSearchL
    }
 
    pPath = hb_strdup( szPath );
-   while( ( pDelim = strchr( pPath, OS_PATH_LIST_SEPARATOR ) ) != NULL )
+   while( ( pDelim = strchr( pPath, HB_OS_PATH_LIST_SEP_CHR ) ) != NULL )
    {
       *pDelim = '\0';
       *pSearchList = ( HB_PATHNAMES * ) hb_xgrab( sizeof( HB_PATHNAMES ) );
@@ -164,7 +164,7 @@ HB_EXPORT PHB_FNAME hb_fsFNameSplit( const char * pszFileName )
    while( --iPos >= 0 )
    {
       if( pszFileName[ iPos ] == cDirSep ||
-          strchr( OS_PATH_DELIMITER_LIST, pszFileName[ iPos ] ) )
+          strchr( HB_OS_PATH_DELIM_CHR_LIST, pszFileName[ iPos ] ) )
       {
          pFileName->szPath = pszPos;
          hb_strncpy( pszPos, pszFileName, iPos + 1 );
@@ -245,7 +245,7 @@ HB_EXPORT char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName )
    /* Strip preceding path separators from the filename */
    pszName = pFileName->szName;
    if( pszName && pszName[ 0 ] != '\0' && ( pszName[ 0 ] == cDirSep ||
-       strchr( OS_PATH_DELIMITER_LIST, pszName[ 0 ] ) != NULL ) )
+       strchr( HB_OS_PATH_DELIM_CHR_LIST, pszName[ 0 ] ) != NULL ) )
       pszName++;
 
    /* Add path if specified */
@@ -259,9 +259,9 @@ HB_EXPORT char * hb_fsFNameMerge( char * pszFileName, PHB_FNAME pFileName )
       int iLen = strlen( pszFileName ) - 1;
 
       if( iLen < _POSIX_PATH_MAX - 2 && pszFileName[ iLen ] != cDirSep &&
-          strchr( OS_PATH_DELIMITER_LIST, pszFileName[ iLen ] ) == NULL )
+          strchr( HB_OS_PATH_DELIM_CHR_LIST, pszFileName[ iLen ] ) == NULL )
       {
-         pszFileName[ iLen + 1 ] = OS_PATH_DELIMITER;
+         pszFileName[ iLen + 1 ] = HB_OS_PATH_DELIM_CHR;
          pszFileName[ iLen + 2 ] = '\0';
       }
    }
diff --git a/harbour/source/compiler/gencobj.c b/harbour/source/compiler/gencobj.c
index a00013283f..d2e3e8050e 100644
--- a/harbour/source/compiler/gencobj.c
+++ b/harbour/source/compiler/gencobj.c
@@ -34,7 +34,7 @@
 /* QUESTION: Allocate buffer dynamically ? */
 #define HB_CFG_LINE_LEN    ( _POSIX_PATH_MAX << 1 )
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    #define HB_NULL_STR " > /dev/null"
 #elif defined( OS_DOS_COMPATIBLE )
    #define HB_NULL_STR " >nul"      
@@ -61,7 +61,7 @@ static char * hb_searchpath( const char * pszFile, char * pszEnv, char * pszCfg
          pszPath = pszEnv;
          while( *pszEnv )
          {
-            if( *pszEnv == OS_PATH_LIST_SEPARATOR )
+            if( *pszEnv == HB_OS_PATH_LIST_SEP_CHR )
             {
                *pszEnv++ = '\0';
                break;
@@ -70,7 +70,7 @@ static char * hb_searchpath( const char * pszFile, char * pszEnv, char * pszCfg
          }
          if( *pszPath )
          {
-            snprintf( pszCfg, _POSIX_PATH_MAX + 1, "%s%c%s", pszPath, OS_PATH_DELIMITER, pszFile );
+            snprintf( pszCfg, _POSIX_PATH_MAX + 1, "%s%c%s", pszPath, HB_OS_PATH_DELIM_CHR, pszFile );
             if( hb_fsFileExists( ( const char * ) pszCfg ) )
             {
                bFound = TRUE;
@@ -133,7 +133,7 @@ void hb_compGenCObj( HB_COMP_DECL, PHB_FNAME pFileName )
    char szOutPath[ _POSIX_PATH_MAX + 1 ] = "\0";
    char pszTemp[ _POSIX_PATH_MAX + 1 ] = "";
    char buffer[ HB_CFG_LINE_LEN * 2 + 1024 ];
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    char * pszEnv = hb_strdup( "/etc:/usr/local/etc" );
 #elif defined( OS_DOS_COMPATIBLE )
    char * pszEnv = hb_getenv( "PATH" );
diff --git a/harbour/source/compiler/hbcomp.c b/harbour/source/compiler/hbcomp.c
index 6ad790ddee..d1aede195b 100644
--- a/harbour/source/compiler/hbcomp.c
+++ b/harbour/source/compiler/hbcomp.c
@@ -294,7 +294,7 @@ void hb_compOutStd( HB_COMP_DECL, const char * szMessage )
       if( HB_COMP_PARAM->outStdFunc )
          HB_COMP_PARAM->outStdFunc( HB_COMP_PARAM->cargo, szMessage );
       else
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
          fprintf( stdout, "%s", szMessage ); fflush( stdout );
 #else
          fprintf( stderr, "%s", szMessage ); fflush( stderr );
@@ -309,7 +309,7 @@ void hb_compOutErr( HB_COMP_DECL, const char * szMessage )
       if( HB_COMP_PARAM->outErrFunc )
          HB_COMP_PARAM->outErrFunc( HB_COMP_PARAM->cargo, szMessage );
       else
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
          fprintf( stderr, "%s", szMessage ); fflush( stderr );
 #else
          fprintf( stdout, "%s", szMessage ); fflush( stdout );
diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c
index 92dfc0b6e7..928607cf39 100644
--- a/harbour/source/compiler/hbusage.c
+++ b/harbour/source/compiler/hbusage.c
@@ -117,7 +117,7 @@ void hb_compPrintUsage( HB_COMP_DECL, char * szSelf )
    for( iLine = 0; iLine < ( int ) ( sizeof( szOptions ) / sizeof( char * ) ); iLine++ )
    {
       snprintf( buffer, sizeof( buffer ),
-                szOptions[ iLine ], OS_OPT_DELIMITER_LIST[ 0 ] );
+                szOptions[ iLine ], HB_OS_OPT_DELIM_LIST[ 0 ] );
       hb_compOutStd( HB_COMP_PARAM, buffer );
    }
 }
diff --git a/harbour/source/debug/dbgentry.c b/harbour/source/debug/dbgentry.c
index 68b115eff6..541a6fa272 100644
--- a/harbour/source/debug/dbgentry.c
+++ b/harbour/source/debug/dbgentry.c
@@ -65,7 +65,7 @@
 /* dummy function declaration */
 static BOOL hb_clsSetScope( BOOL fScope ) { return fScope; }
 
-#if defined( HB_OS_UNIX_COMPATIBLE )
+#if defined( HB_HB_OS_UNIX_COMPATIBLE )
 #define FILENAME_EQUAL(s1, s2) ( !strcmp( (s1), (s2) ) )
 #else
 #define FILENAME_EQUAL(s1, s2) ( !hb_stricmp( (s1), (s2) ) )
diff --git a/harbour/source/main/harbour.c b/harbour/source/main/harbour.c
index de2ba8f929..e4b9ca19ef 100644
--- a/harbour/source/main/harbour.c
+++ b/harbour/source/main/harbour.c
@@ -357,11 +357,11 @@ char * hb_conNewLine( void )
 static int  s_iFileCase = HB_SET_CASE_MIXED;
 static int  s_iDirCase  = HB_SET_CASE_MIXED;
 static BOOL s_fFnTrim   = FALSE;
-static char s_cDirSep   = OS_PATH_DELIMITER;
+static char s_cDirSep   = HB_OS_PATH_DELIM_CHR;
 
 HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree )
 {
-   if( s_fFnTrim || s_cDirSep != OS_PATH_DELIMITER ||
+   if( s_fFnTrim || s_cDirSep != HB_OS_PATH_DELIM_CHR ||
        s_iFileCase != HB_SET_CASE_MIXED || s_iDirCase != HB_SET_CASE_MIXED )
    {
       PHB_FNAME pFileName;
@@ -375,13 +375,13 @@ HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree )
          *pfFree = TRUE;
       }
 
-      if( s_cDirSep != OS_PATH_DELIMITER )
+      if( s_cDirSep != HB_OS_PATH_DELIM_CHR )
       {
          BYTE *p = szFileName;
          while( *p )
          {
             if( *p == s_cDirSep )
-               *p = OS_PATH_DELIMITER;
+               *p = HB_OS_PATH_DELIM_CHR;
             p++;
          }
       }
@@ -522,12 +522,12 @@ static void hb_compChkFileSwitches( int argc, char * argv[] )
             case 'p':
                if( !argv[i][3] )
                {
-                  s_cDirSep = OS_PATH_DELIMITER;
+                  s_cDirSep = HB_OS_PATH_DELIM_CHR;
                   n = 3;
                }
                else if( argv[i][3] == '-' )
                {
-                  s_cDirSep = OS_PATH_DELIMITER;
+                  s_cDirSep = HB_OS_PATH_DELIM_CHR;
                   n = 4;
                }
                else if( argv[i][3] == ':' && argv[i][4] )
diff --git a/harbour/source/pp/hbpp.c b/harbour/source/pp/hbpp.c
index 014b081cde..876d44a993 100644
--- a/harbour/source/pp/hbpp.c
+++ b/harbour/source/pp/hbpp.c
@@ -67,7 +67,7 @@ void * hb_xgrab( ULONG ulSize ) { return malloc( ulSize ); }
 void * hb_xrealloc( void * pMem, ULONG ulSize ) { return realloc( pMem, ulSize ); }
 void hb_xfree( void * pMem ) { free( pMem ); }
 BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree ) { if( pfFree ) * pfFree = FALSE; return szFileName; }
-int hb_setGetDirSeparator( void ) { return OS_PATH_DELIMITER; }
+int hb_setGetDirSeparator( void ) { return HB_OS_PATH_DELIM_CHR; }
 int hb_verSvnID( void ) { return 0; }
 
 /*
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 38b7f5c512..0114f9a643 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -5258,8 +5258,8 @@ void hb_pp_initDynDefines( PHB_PP_STATE pState )
    hb_pp_addDefine( pState, "__PDP_ENDIAN__", szResult );
 #endif
 
-#ifdef HARBOUR_START_PROCEDURE
-   hb_pp_addDefine( pState, "__HB_MAIN__", HARBOUR_START_PROCEDURE );
+#ifdef HB_START_PROCEDURE
+   hb_pp_addDefine( pState, "__HB_MAIN__", HB_START_PROCEDURE );
 #endif
 }
 
diff --git a/harbour/source/rdd/dbcmd.c b/harbour/source/rdd/dbcmd.c
index b746599757..71941e0c70 100644
--- a/harbour/source/rdd/dbcmd.c
+++ b/harbour/source/rdd/dbcmd.c
@@ -179,7 +179,7 @@ HB_FUNC( ALIAS )
    pArea = ( AREAP ) hb_rddGetWorkAreaPointer( iArea );
    if( pArea )
    {
-      char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+      char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
       if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == SUCCESS )
       {
@@ -252,7 +252,7 @@ HB_FUNC( DBF )
 
    if( pArea )
    {
-      char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+      char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
       if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) == SUCCESS )
       {
@@ -705,7 +705,7 @@ HB_FUNC( DBSELECTAREA )
    if( szAlias )
    {
       hb_rddSelectWorkAreaAlias( szAlias );
-      if( hb_rddGetCurrentWorkAreaNumber() == HARBOUR_MAX_RDD_AREA_NUM )
+      if( hb_rddGetCurrentWorkAreaNumber() == HB_RDD_MAX_AREA_NUM )
          hb_rddSelectFirstAvailable();
    }
    else
@@ -713,10 +713,10 @@ HB_FUNC( DBSELECTAREA )
       LONG lNewArea = hb_parnl( 1 );
 
       /*
-       * NOTE: lNewArea >= HARBOUR_MAX_RDD_AREA_NUM used intentionally
+       * NOTE: lNewArea >= HB_RDD_MAX_AREA_NUM used intentionally
        * In Clipper area 65535 is reserved for "M" alias [druzus]
        */
-      if( lNewArea < 1 || lNewArea >= HARBOUR_MAX_RDD_AREA_NUM )
+      if( lNewArea < 1 || lNewArea >= HB_RDD_MAX_AREA_NUM )
       {
          hb_rddSelectFirstAvailable();
       }
@@ -1491,7 +1491,7 @@ HB_FUNC( RDDNAME )
 
    if( pArea )
    {
-      char pBuffer[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ];
+      char pBuffer[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ];
       pBuffer[ 0 ] = '\0';
       SELF_SYSNAME( pArea, ( BYTE * ) pBuffer );
       hb_retc( pBuffer );
@@ -1503,13 +1503,13 @@ HB_FUNC( RDDNAME )
 HB_FUNC( RDDREGISTER )
 {
    USHORT uiLen;
-   char szDriver[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ];
+   char szDriver[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ];
 
    uiLen = ( USHORT ) hb_parclen( 1 );
    if( uiLen > 0 )
    {
-      if( uiLen > HARBOUR_MAX_RDD_DRIVERNAME_LENGTH )
-         uiLen = HARBOUR_MAX_RDD_DRIVERNAME_LENGTH;
+      if( uiLen > HB_RDD_MAX_DRIVERNAME_LEN )
+         uiLen = HB_RDD_MAX_DRIVERNAME_LEN;
 
       hb_strncpyUpper( szDriver, hb_parc( 1 ), uiLen );
       /*
@@ -1991,7 +1991,7 @@ HB_FUNC( __DBCOPY )
 
 HB_FUNC( HB_RDDGETTEMPALIAS )
 {
-   char szAliasTmp[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+   char szAliasTmp[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
    if( hb_rddGetTempAlias( szAliasTmp ) == SUCCESS )
       hb_retc( szAliasTmp );
diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c
index c497c61314..cdaa5535eb 100644
--- a/harbour/source/rdd/dbf1.c
+++ b/harbour/source/rdd/dbf1.c
@@ -3575,7 +3575,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo )
    LPDBFFIELD pField;
    DBFIELDINFO dbFieldInfo;
    BYTE szFileName[ _POSIX_PATH_MAX + 1 ];
-   char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+   char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
    HB_TRACE(HB_TR_DEBUG, ("hb_dbfOpen(%p, %p)", pArea, pOpenInfo));
 
@@ -3669,7 +3669,7 @@ static ERRCODE hb_dbfOpen( DBFAREAP pArea, LPDBOPENINFO pOpenInfo )
    /* Create default alias if necessary */
    if( !pOpenInfo->atomAlias && pFileName->szName )
    {
-      hb_strncpyUpperTrim( szAlias, pFileName->szName, HARBOUR_MAX_RDD_ALIAS_LENGTH );
+      hb_strncpyUpperTrim( szAlias, pFileName->szName, HB_RDD_MAX_ALIAS_LEN );
       pOpenInfo->atomAlias = ( BYTE * ) szAlias;
    }
    hb_xfree( pFileName );
diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c
index ce970645c3..454bfdd8f2 100644
--- a/harbour/source/rdd/delim1.c
+++ b/harbour/source/rdd/delim1.c
@@ -1326,7 +1326,7 @@ static ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo )
    USHORT uiFlags;
    BOOL fRetry;
    BYTE szFileName[ _POSIX_PATH_MAX + 1 ];
-   char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+   char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
    HB_TRACE(HB_TR_DEBUG, ("hb_delimOpen(%p,%p)", pArea, pOpenInfo));
 
@@ -1364,7 +1364,7 @@ static ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo )
    /* Create default alias if necessary */
    if( !pOpenInfo->atomAlias && pFileName->szName )
    {
-      hb_strncpyUpperTrim( szAlias, pFileName->szName, HARBOUR_MAX_RDD_ALIAS_LENGTH );
+      hb_strncpyUpperTrim( szAlias, pFileName->szName, HB_RDD_MAX_ALIAS_LEN );
       pOpenInfo->atomAlias = ( BYTE * ) szAlias;
    }
    hb_xfree( pFileName );
diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c
index fe260701f3..6d7248b45a 100644
--- a/harbour/source/rdd/sdf1.c
+++ b/harbour/source/rdd/sdf1.c
@@ -1059,7 +1059,7 @@ static ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo )
    USHORT uiFlags;
    BOOL fRetry;
    BYTE szFileName[ _POSIX_PATH_MAX + 1 ];
-   char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+   char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
    HB_TRACE(HB_TR_DEBUG, ("hb_sdfOpen(%p,%p)", pArea, pOpenInfo));
 
@@ -1097,7 +1097,7 @@ static ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo )
    /* Create default alias if necessary */
    if( !pOpenInfo->atomAlias && pFileName->szName )
    {
-      hb_strncpyUpperTrim( szAlias, pFileName->szName, HARBOUR_MAX_RDD_ALIAS_LENGTH );
+      hb_strncpyUpperTrim( szAlias, pFileName->szName, HB_RDD_MAX_ALIAS_LEN );
       pOpenInfo->atomAlias = ( BYTE * ) szAlias;
    }
    hb_xfree( pFileName );
diff --git a/harbour/source/rdd/usrrdd/usrrdd.c b/harbour/source/rdd/usrrdd/usrrdd.c
index f1be0b7ed2..59c4483647 100644
--- a/harbour/source/rdd/usrrdd/usrrdd.c
+++ b/harbour/source/rdd/usrrdd/usrrdd.c
@@ -895,7 +895,7 @@ static ERRCODE hb_usrSysName( AREAP pArea, BYTE * szSysName )
    {
       hb_stackPop();
       hb_strncpy( ( char * ) szSysName, SELF_RDDNODE( pArea )->szName,
-                  HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+                  HB_RDD_MAX_DRIVERNAME_LEN );
       return SUCCESS;
    }
 
@@ -904,7 +904,7 @@ static ERRCODE hb_usrSysName( AREAP pArea, BYTE * szSysName )
    hb_vmDo( 2 );
 
    hb_strncpy( ( char * ) szSysName, hb_itemGetCPtr( hb_stackItemFromBase( lOffset ) ),
-               HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+               HB_RDD_MAX_DRIVERNAME_LEN );
    hb_stackPop();
 
    return hb_usrReturn();
@@ -1586,7 +1586,7 @@ static ERRCODE hb_usrAlias( AREAP pArea, BYTE * szAlias )
    hb_vmDo( 2 );
 
    hb_strncpy( ( char * ) szAlias, hb_itemGetCPtr( hb_stackItemFromBase( lOffset ) ),
-               HARBOUR_MAX_RDD_ALIAS_LENGTH );
+               HB_RDD_MAX_ALIAS_LEN );
    hb_stackPop();
 
    return hb_usrReturn();
@@ -3480,7 +3480,7 @@ HB_FUNC_UR_SUPER( ALIAS )
 
    if( pArea )
    {
-      char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+      char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
       hb_retni( SUPER_ALIAS( pArea, ( BYTE * ) szAlias ) );
       hb_storc( szAlias, 2 );
diff --git a/harbour/source/rdd/wacore.c b/harbour/source/rdd/wacore.c
index 6e2a5dcfcf..6b09f9a8d3 100644
--- a/harbour/source/rdd/wacore.c
+++ b/harbour/source/rdd/wacore.c
@@ -97,7 +97,7 @@ HB_EXPORT ERRCODE hb_rddSelectFirstAvailable( void )
          break;
       uiArea++;
    }
-   if( uiArea >= HARBOUR_MAX_RDD_AREA_NUM )
+   if( uiArea >= HB_RDD_MAX_AREA_NUM )
       return FAILURE;
    HB_SET_WA( uiArea );
    return SUCCESS;
@@ -135,8 +135,8 @@ HB_EXPORT USHORT hb_rddInsertAreaNode( const char *szDriver )
    {
       int iSize = ( ( ( int ) s_uiCurrArea + 256 ) >> 8 ) << 8;
 
-      if( iSize > HARBOUR_MAX_RDD_AREA_NUM )
-         iSize = HARBOUR_MAX_RDD_AREA_NUM;
+      if( iSize > HB_RDD_MAX_AREA_NUM )
+         iSize = HB_RDD_MAX_AREA_NUM;
 
       if( s_uiWaNumMax == 0 )
       {
@@ -342,17 +342,17 @@ HB_EXPORT void hb_rddSetNetErr( BOOL fNetErr )
  */
 HB_EXPORT const char * hb_rddDefaultDrv( const char * szDriver )
 {
-   static char s_szDefDriver[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ] = "";
+   static char s_szDefDriver[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ] = "";
    static BOOL s_fInit = FALSE;
 
    if( szDriver && *szDriver )
    {
-      char szNewDriver[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ];
+      char szNewDriver[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ];
 
-      hb_strncpyUpper( szNewDriver, szDriver, HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+      hb_strncpyUpper( szNewDriver, szDriver, HB_RDD_MAX_DRIVERNAME_LEN );
       if( !hb_rddFindNode( szNewDriver, NULL ) )
          return NULL;
-      hb_strncpy( s_szDefDriver, szNewDriver, HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+      hb_strncpy( s_szDefDriver, szNewDriver, HB_RDD_MAX_DRIVERNAME_LEN );
    }
    else if( !s_fInit && !s_szDefDriver[ 0 ] && hb_rddGetNode( 0 ) )
    {
@@ -363,7 +363,7 @@ HB_EXPORT const char * hb_rddDefaultDrv( const char * szDriver )
       {
          if( hb_rddFindNode( szDrvTable[ i ], NULL ) )
          {
-            hb_strncpy( s_szDefDriver, szDrvTable[ i ], HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+            hb_strncpy( s_szDefDriver, szDrvTable[ i ], HB_RDD_MAX_DRIVERNAME_LEN );
             break;
          }
       }
@@ -415,7 +415,7 @@ HB_EXPORT ERRCODE hb_rddSelectWorkAreaNumber( int iArea )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_rddSelectWorkAreaNumber(%d)", iArea));
 
-   if( iArea < 1 || iArea > HARBOUR_MAX_RDD_AREA_NUM )
+   if( iArea < 1 || iArea > HB_RDD_MAX_AREA_NUM )
       HB_SET_WA( 0 );
    else
       HB_SET_WA( iArea );
diff --git a/harbour/source/rdd/wafunc.c b/harbour/source/rdd/wafunc.c
index 9149bc88fd..ed0ab617d1 100644
--- a/harbour/source/rdd/wafunc.c
+++ b/harbour/source/rdd/wafunc.c
@@ -249,7 +249,7 @@ HB_EXPORT USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField )
 
    if( strchr( szField, '>' ) != NULL )
    {
-      char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+      char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
       int i, j, l;
 
       n = 0;
@@ -334,7 +334,7 @@ HB_EXPORT ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea )
    }
    else if( fOneLetter && c == 'M' )
    {
-      *iArea = HARBOUR_MAX_RDD_AREA_NUM;
+      *iArea = HB_RDD_MAX_AREA_NUM;
    }
    else
    {
@@ -385,7 +385,7 @@ HB_EXPORT ERRCODE hb_rddSelectWorkAreaSymbol( PHB_SYMB pSymAlias )
       }
       else if( szName[ 0 ] == 'M' || szName[ 0 ] == 'm' )
       {
-         hb_rddSelectWorkAreaNumber( HARBOUR_MAX_RDD_AREA_NUM );
+         hb_rddSelectWorkAreaNumber( HB_RDD_MAX_AREA_NUM );
          return SUCCESS;
       }
    }
@@ -449,7 +449,7 @@ HB_EXPORT ERRCODE hb_rddSelectWorkAreaAlias( const char * szAlias )
 
    if( errCode == SUCCESS )
    {
-      if( iArea < 1 || iArea > HARBOUR_MAX_RDD_AREA_NUM )
+      if( iArea < 1 || iArea > HB_RDD_MAX_AREA_NUM )
          errCode = hb_rddSelectFirstAvailable();
       else
          errCode = hb_rddSelectWorkAreaNumber( iArea );
@@ -588,7 +588,7 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver,
                          const char * szCpId, ULONG ulConnection,
                          PHB_ITEM pStruct, PHB_ITEM pDelim )
 {
-   char szDriverBuffer[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ];
+   char szDriverBuffer[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ];
    DBOPENINFO pInfo;
    ERRCODE errCode;
    AREAP pArea;
@@ -619,7 +619,7 @@ ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver,
     */
    if( szDriver && szDriver[ 0 ] )
    {
-      hb_strncpyUpper( szDriverBuffer, szDriver, HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+      hb_strncpyUpper( szDriverBuffer, szDriver, HB_RDD_MAX_DRIVERNAME_LEN );
       szDriver = szDriverBuffer;
    }
    else
@@ -676,7 +676,7 @@ ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver,
                            const char * szCpId, ULONG ulConnection,
                            PHB_ITEM pStruct, PHB_ITEM pDelim )
 {
-   char szDriverBuffer[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ];
+   char szDriverBuffer[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ];
    DBOPENINFO pInfo;
    ERRCODE errCode;
    USHORT uiPrevArea;
@@ -690,7 +690,7 @@ ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver,
 
    if( szDriver && szDriver[ 0 ] )
    {
-      hb_strncpyUpper( szDriverBuffer, szDriver, HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+      hb_strncpyUpper( szDriverBuffer, szDriver, HB_RDD_MAX_DRIVERNAME_LEN );
       szDriver = szDriverBuffer;
    }
    else
diff --git a/harbour/source/rdd/workarea.c b/harbour/source/rdd/workarea.c
index b50861e4c3..f7097691fb 100644
--- a/harbour/source/rdd/workarea.c
+++ b/harbour/source/rdd/workarea.c
@@ -650,7 +650,7 @@ static ERRCODE hb_waAlias( AREAP pArea, BYTE * szAlias )
    hb_strncpy( ( char * ) szAlias,
       pArea->atomAlias && hb_dynsymAreaHandle( ( PHB_DYNS ) pArea->atomAlias )
       ? hb_dynsymName( ( PHB_DYNS ) pArea->atomAlias ) : "",
-      HARBOUR_MAX_RDD_ALIAS_LENGTH );
+      HB_RDD_MAX_ALIAS_LEN );
 
    return SUCCESS;
 }
@@ -802,7 +802,7 @@ static ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
 
       case DBI_ALIAS:
       {
-         char szAlias[ HARBOUR_MAX_RDD_ALIAS_LENGTH + 1 ];
+         char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
          if( SELF_ALIAS( pArea, ( BYTE * ) szAlias ) != SUCCESS )
          {
             return FAILURE;
@@ -996,7 +996,7 @@ static ERRCODE hb_waSysName( AREAP pArea, BYTE * pBuffer )
    HB_TRACE(HB_TR_DEBUG, ("hb_waSysName(%p, %p)", pArea, pBuffer));
 
    hb_strncpy( ( char * ) pBuffer, SELF_RDDNODE( pArea )->szName,
-               HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+               HB_RDD_MAX_DRIVERNAME_LEN );
 
    return SUCCESS;
 }
@@ -1721,11 +1721,11 @@ static ERRCODE hb_waError( AREAP pArea, PHB_ITEM pError )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_waError(%p, %p)", pArea, pError));
 
-   szRddName = ( char * ) hb_xgrab( HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 );
+   szRddName = ( char * ) hb_xgrab( HB_RDD_MAX_DRIVERNAME_LEN + 1 );
    if( pArea && pArea->lprfsHost->sysName )
       SELF_SYSNAME( pArea, ( BYTE * ) szRddName );
    else
-      hb_strncpy( szRddName, "???DRIVER", HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+      hb_strncpy( szRddName, "???DRIVER", HB_RDD_MAX_DRIVERNAME_LEN );
    hb_errPutSeverity( pError, ES_ERROR );
    hb_errPutSubSystem( pError, szRddName );
    hb_xfree( szRddName );
@@ -2157,7 +2157,7 @@ HB_EXPORT int hb_rddRegister( const char * szDriver, USHORT uiType )
 {
    LPRDDNODE pRddNewNode;
    PHB_DYNS pGetFuncTable;
-   char szGetFuncTable[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 14 ];
+   char szGetFuncTable[ HB_RDD_MAX_DRIVERNAME_LEN + 14 ];
    USHORT uiFunctions;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_rddRegister(%s, %hu)", szDriver, uiType));
@@ -2180,7 +2180,7 @@ HB_EXPORT int hb_rddRegister( const char * szDriver, USHORT uiType )
    memset( pRddNewNode, 0, sizeof( RDDNODE ) );
 
    /* Fill the new RDD node */
-   hb_strncpy( pRddNewNode->szName, szDriver, HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+   hb_strncpy( pRddNewNode->szName, szDriver, HB_RDD_MAX_DRIVERNAME_LEN );
    pRddNewNode->uiType = uiType;
    pRddNewNode->rddID = s_uiRddMax;
 
@@ -2241,8 +2241,8 @@ HB_EXPORT ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable,
    }
    else
    {
-      char szSuperName[ HARBOUR_MAX_RDD_DRIVERNAME_LENGTH + 1 ];
-      hb_strncpyUpper( szSuperName, szDrvName, HARBOUR_MAX_RDD_DRIVERNAME_LENGTH );
+      char szSuperName[ HB_RDD_MAX_DRIVERNAME_LEN + 1 ];
+      hb_strncpyUpper( szSuperName, szDrvName, HB_RDD_MAX_DRIVERNAME_LEN );
       pRddNode = hb_rddFindNode( szSuperName, NULL );
 
       if( !pRddNode )
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index 8f8dec9d73..00cca11d79 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -83,13 +83,13 @@
  */
 
 /* length of buffer for CR/LF characters */
-#if !defined(OS_EOL_LEN) || OS_EOL_LEN < 4
+#if !defined(HB_OS_EOL_LEN) || HB_OS_EOL_LEN < 4
 #  define CRLF_BUFFER_LEN   4
 #else
-#  define CRLF_BUFFER_LEN   OS_EOL_LEN + 1
+#  define CRLF_BUFFER_LEN   HB_OS_EOL_LEN + 1
 #endif
 
-#if defined(OS_UNIX_COMPATIBLE) && !defined(HB_EOL_CRLF)
+#if defined(HB_OS_UNIX_COMPATIBLE) && !defined(HB_EOL_CRLF)
    static const char s_szCrLf[ CRLF_BUFFER_LEN ] = { HB_CHAR_LF, 0 };
    static const int  s_iCrLfLen = 1;
 #else
diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c
index 0d97b04c68..b9c4ad610c 100644
--- a/harbour/source/rtl/copyfile.c
+++ b/harbour/source/rtl/copyfile.c
@@ -54,7 +54,7 @@
 #include "hbapierr.h"
 #include "hbapifs.h"
 
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
    #include <sys/stat.h>
    #include <unistd.h>
 #endif
@@ -90,7 +90,7 @@ static BOOL hb_fsCopy( char * szSource, char * szDest )
 
       if( fhndDest != FS_ERROR )
       {
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
          struct stat struFileInfo;
          int iSuccess = fstat( fhndSource, &struFileInfo );
 #endif
@@ -117,7 +117,7 @@ static BOOL hb_fsCopy( char * szSource, char * szDest )
 
          hb_xfree( buffer );
 
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
          if( iSuccess == 0 )
             fchmod( fhndDest, struFileInfo.st_mode );
 #endif
diff --git a/harbour/source/rtl/defpath.c b/harbour/source/rtl/defpath.c
index ac5a2d6ee0..d09f6edc5e 100644
--- a/harbour/source/rtl/defpath.c
+++ b/harbour/source/rtl/defpath.c
@@ -66,7 +66,7 @@ HB_FUNC( __DEFPATH )
    }
 
    HB_TRACE(HB_TR_INFO, ("HB_DEFPATH: buffer is |%s|, size is %d, last char is |%c|", buffer, size, buffer[ size - 1]));
-   HB_TRACE(HB_TR_INFO, ("HB_DEFPATH: OS_PATH_DELIMITER is |%c| and OS_PATH_LIST_SEPARATOR is |%c|", OS_PATH_DELIMITER, OS_PATH_LIST_SEPARATOR));
+   HB_TRACE(HB_TR_INFO, ("HB_DEFPATH: HB_OS_PATH_DELIM_CHR is |%c| and HB_OS_PATH_LIST_SEP_CHR is |%c|", HB_OS_PATH_DELIM_CHR, HB_OS_PATH_LIST_SEP_CHR));
 
    /* If the path is not empty and it doesn't end with a drive or path
       delimiter, then add the appropriate separator. Use ':' if the size
@@ -74,18 +74,18 @@ HB_FUNC( __DEFPATH )
       the path delimiter. This allows the use of a drive letter delimiter
       for DOS compatible operating systems while preventing it from being
       with a Unix compatible OS. */
-#ifdef OS_HAS_DRIVE_LETTER
-   if( size && buffer[ size - 1 ] != OS_PATH_DELIMITER &&
-               buffer[ size - 1 ] != OS_DRIVE_DELIMITER )
+#ifdef HB_OS_HAS_DRIVE_LETTER
+   if( size && buffer[ size - 1 ] != HB_OS_PATH_DELIM_CHR &&
+               buffer[ size - 1 ] != HB_OS_DRIVE_DELIM_CHR )
    {
       if( size == 1 )
-         buffer[ size++ ] = OS_DRIVE_DELIMITER;
+         buffer[ size++ ] = HB_OS_DRIVE_DELIM_CHR;
       else
-         buffer[ size++ ] = OS_PATH_DELIMITER;
+         buffer[ size++ ] = HB_OS_PATH_DELIM_CHR;
    }
 #else
-   if( size && buffer[ size - 1 ] != OS_PATH_DELIMITER )
-      buffer[ size++ ] = OS_PATH_DELIMITER;
+   if( size && buffer[ size - 1 ] != HB_OS_PATH_DELIM_CHR )
+      buffer[ size++ ] = HB_OS_PATH_DELIM_CHR;
 #endif
 
    hb_retclen( buffer, size );
diff --git a/harbour/source/rtl/direct.c b/harbour/source/rtl/direct.c
index 6cb8b8a969..ae60d73407 100644
--- a/harbour/source/rtl/direct.c
+++ b/harbour/source/rtl/direct.c
@@ -145,22 +145,22 @@ HB_FUNC( DIRECTORY )
           * last character is directory or drive separator
           */
          int iLen = strlen( szDirSpec ) - 1;
-#ifdef OS_HAS_DRIVE_LETTER
-         if( szDirSpec[ iLen ] == OS_PATH_DELIMITER ||
-             szDirSpec[ iLen ] == OS_DRIVE_DELIMITER )
+#ifdef HB_OS_HAS_DRIVE_LETTER
+         if( szDirSpec[ iLen ] == HB_OS_PATH_DELIM_CHR ||
+             szDirSpec[ iLen ] == HB_OS_DRIVE_DELIM_CHR )
 #else
-         if( szDirSpec[ iLen ] == OS_PATH_DELIMITER )
+         if( szDirSpec[ iLen ] == HB_OS_PATH_DELIM_CHR )
 #endif
          {
             if( fFree )
             {
-               char * szTemp = hb_xstrcpy( NULL, szDirSpec, OS_FILE_MASK, NULL );
+               char * szTemp = hb_xstrcpy( NULL, szDirSpec, HB_OS_ALLFILE_MASK, NULL );
                hb_xfree( szDirSpec );
                szDirSpec = szTemp;
             }
             else
             {
-               szDirSpec = hb_xstrcpy( NULL, szDirSpec, OS_FILE_MASK, NULL );
+               szDirSpec = hb_xstrcpy( NULL, szDirSpec, HB_OS_ALLFILE_MASK, NULL );
                fFree = TRUE;
             }
          }
@@ -172,11 +172,11 @@ HB_FUNC( DIRECTORY )
             hb_xfree( szDirSpec );
             fFree = FALSE;
          }
-         szDirSpec = ( char * ) OS_FILE_MASK;
+         szDirSpec = ( char * ) HB_OS_ALLFILE_MASK;
       }
    }
    else
-      szDirSpec = ( char * ) OS_FILE_MASK;
+      szDirSpec = ( char * ) HB_OS_ALLFILE_MASK;
 
    /* Get the file list */
 
diff --git a/harbour/source/rtl/disksphb.c b/harbour/source/rtl/disksphb.c
index 7d10b8ab59..b14b53313c 100644
--- a/harbour/source/rtl/disksphb.c
+++ b/harbour/source/rtl/disksphb.c
@@ -78,18 +78,18 @@ HB_FUNC( HB_DISKSPACE )
 
    if( !szPath )
    {
-#ifdef OS_HAS_DRIVE_LETTER
+#ifdef HB_OS_HAS_DRIVE_LETTER
       if( ISNUM( 1 ) )
       {
          szPathBuf[ 0 ] = ( char ) hb_parni( 1 ) + 'A' - 1;
-         szPathBuf[ 1 ] = OS_DRIVE_DELIMITER;
-         szPathBuf[ 2 ] = OS_PATH_DELIMITER;
+         szPathBuf[ 1 ] = HB_OS_DRIVE_DELIM_CHR;
+         szPathBuf[ 2 ] = HB_OS_PATH_DELIM_CHR;
          szPathBuf[ 3 ] = '\0';
       }
       else
 #endif
       {
-         szPathBuf[ 0 ] = OS_PATH_DELIMITER;
+         szPathBuf[ 0 ] = HB_OS_PATH_DELIM_CHR;
          szPathBuf[ 1 ] = '\0';
       }
       szPath = szPathBuf;
@@ -97,7 +97,7 @@ HB_FUNC( HB_DISKSPACE )
 
 #if defined(HB_OS_DOS)
    {
-      USHORT uiDrive = szPath[ 1 ] != OS_DRIVE_DELIMITER ? 0 :
+      USHORT uiDrive = szPath[ 1 ] != HB_OS_DRIVE_DELIM_CHR ? 0 :
                        ( szPath[ 0 ] >= 'A' && szPath[ 0 ] <= 'Z' ?
                          szPath[ 0 ] - 'A' + 1 :
                        ( szPath[ 0 ] >= 'a' && szPath[ 0 ] <= 'z' ?
@@ -286,7 +286,7 @@ HB_FUNC( HB_DISKSPACE )
    {
       struct _FSALLOCATE fsa;
       USHORT rc;
-      USHORT uiDrive = szPath[ 1 ] != OS_DRIVE_DELIMITER ? 0 :
+      USHORT uiDrive = szPath[ 1 ] != HB_OS_DRIVE_DELIM_CHR ? 0 :
                        ( szPath[ 0 ] >= 'A' && szPath[ 0 ] <= 'Z' ?
                          szPath[ 0 ] - 'A' + 1 :
                        ( szPath[ 0 ] >= 'a' && szPath[ 0 ] <= 'z' ?
diff --git a/harbour/source/rtl/file.c b/harbour/source/rtl/file.c
index d5cd870452..839b63d0a4 100644
--- a/harbour/source/rtl/file.c
+++ b/harbour/source/rtl/file.c
@@ -87,7 +87,7 @@ HB_EXPORT BOOL hb_fsIsDirectory( BYTE * pFilename )
    pFilename = hb_fsNameConv( pFilename, &fFree );
 
    iLen = strlen( ( char * ) pFilename );
-   while( iLen && strchr( OS_PATH_DELIMITER_LIST, pFilename[ iLen - 1 ] ) )
+   while( iLen && strchr( HB_OS_PATH_DELIM_CHR_LIST, pFilename[ iLen - 1 ] ) )
       --iLen;
 
    if( pFilename[ iLen ] )
diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index 6dcfdcd6f2..83eca92f4f 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -113,7 +113,7 @@
 #include "hb_io.h"
 #include "hbset.h"
 
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
    #include <unistd.h>
    #include <signal.h>
    #include <time.h>
@@ -206,7 +206,7 @@
    #include <sys/file.h>
 #endif
 
-#if !defined( HB_USE_LARGEFILE64 ) && defined( OS_UNIX_COMPATIBLE )
+#if !defined( HB_USE_LARGEFILE64 ) && defined( HB_OS_UNIX_COMPATIBLE )
    #if defined( __USE_LARGEFILE64 )
       /*
        * The macro: __USE_LARGEFILE64 is set when _LARGEFILE64_SOURCE is
@@ -219,7 +219,7 @@
    #endif
 #endif
 
-#if defined(OS_HAS_DRIVE_LETTER)
+#if defined(HB_OS_HAS_DRIVE_LETTER)
 /* 27/08/2004 - <maurilio.longo@libero.it>
                 HB_FS_GETDRIVE() should return a number in the range 0..25 ('A'..'Z')
                 HB_FS_SETDRIVE() should accept a number inside same range.
@@ -257,7 +257,7 @@
    #define HB_FS_SETDRIVE(n)  _chdrive( ( n ) + 1 )
 
 #endif
-#endif /* OS_HAS_DRIVE_LETTER */
+#endif /* HB_OS_HAS_DRIVE_LETTER */
 
 #ifndef O_BINARY
    #define O_BINARY     0       /* O_BINARY not defined on Linux */
@@ -539,7 +539,7 @@ HB_EXPORT FHANDLE hb_fsPOpen( BYTE * pFilename, BYTE * pMode )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsPOpen(%p, %s)", pFilename, pMode));
 
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
    {
       FHANDLE hPipeHandle[2], hNullHandle;
       pid_t pid;
@@ -1135,7 +1135,7 @@ HB_EXPORT BOOL hb_fsSetFileTime( BYTE * pszFileName, LONG lJulian, LONG lMillise
       if( fFree )
          hb_xfree( pszFileName );
    }
-#elif defined( OS_UNIX_COMPATIBLE ) || defined( HB_OS_DOS )
+#elif defined( HB_OS_UNIX_COMPATIBLE ) || defined( HB_OS_DOS )
    {
       BOOL fFree;
 
@@ -1261,7 +1261,7 @@ HB_EXPORT BOOL hb_fsSetAttr( BYTE * pszFileName, ULONG ulAttr )
 #  endif
    hb_fsSetIOError( fResult, 0 );
 
-#elif defined( OS_UNIX_COMPATIBLE )
+#elif defined( HB_OS_UNIX_COMPATIBLE )
    {
       int iAttr = HB_FA_POSIX_ATTR( ulAttr );
       if( iAttr == 0 )
@@ -2281,7 +2281,7 @@ HB_EXPORT USHORT hb_fsCurDirBuff( USHORT uiDrive, BYTE * pbyBuffer, ULONG ulLen
    pbyBuffer[ 0 ] = '\0';
 
    /*
-    * do not cover this code by OS_HAS_DRIVE_LETTER macro
+    * do not cover this code by HB_OS_HAS_DRIVE_LETTER macro
     * It will allow us to add drive emulation in hb_fsCurDrv()/hb_fsChDrv()
     * and hb_fsNameConv()
     */
@@ -2339,21 +2339,21 @@ HB_EXPORT USHORT hb_fsCurDirBuff( USHORT uiDrive, BYTE * pbyBuffer, ULONG ulLen
 
       ulLen = strlen( ( char * ) pbyBuffer );
 
-#if defined(OS_HAS_DRIVE_LETTER)
-      if( pbyStart[ 1 ] == OS_DRIVE_DELIMITER )
+#if defined(HB_OS_HAS_DRIVE_LETTER)
+      if( pbyStart[ 1 ] == HB_OS_DRIVE_DELIM_CHR )
       {
          pbyStart += 2;
          ulLen -= 2;
       }
 #endif
-      if( strchr( OS_PATH_DELIMITER_LIST, pbyStart[ 0 ] ) )
+      if( strchr( HB_OS_PATH_DELIM_CHR_LIST, pbyStart[ 0 ] ) )
       {
          pbyStart++;
          ulLen--;
       }
 
       /* Strip the trailing (back)slash if there's one */
-      if( ulLen && strchr( OS_PATH_DELIMITER_LIST, pbyStart[ ulLen - 1 ] ) )
+      if( ulLen && strchr( HB_OS_PATH_DELIM_CHR_LIST, pbyStart[ ulLen - 1 ] ) )
          ulLen--;
 
       if( ulLen && pbyBuffer != pbyStart )
@@ -2373,7 +2373,7 @@ HB_EXPORT USHORT hb_fsChDrv( BYTE nDrive )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsChDrv(%d)", (int) nDrive));
 
-#if defined(OS_HAS_DRIVE_LETTER)
+#if defined(HB_OS_HAS_DRIVE_LETTER)
    {
       /* 'unsigned int' _have to_ be used in Watcom */
       UINT uiSave, uiNewDrive;
@@ -2432,7 +2432,7 @@ HB_EXPORT USHORT hb_fsIsDrv( BYTE nDrive )
       uiResult = ( type == DRIVE_UNKNOWN || type == DRIVE_NO_ROOT_DIR ) ? F_ERROR : 0;
       hb_fsSetError( 0 );
    }
-#elif defined(OS_HAS_DRIVE_LETTER)
+#elif defined(HB_OS_HAS_DRIVE_LETTER)
    {
       /* 'unsigned int' _have to_ be used in Watcom
        */
@@ -2503,7 +2503,7 @@ HB_EXPORT BYTE hb_fsCurDrv( void )
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fsCurDrv()"));
 
-#if defined(OS_HAS_DRIVE_LETTER)
+#if defined(HB_OS_HAS_DRIVE_LETTER)
 
    HB_FS_GETDRIVE( uiResult );
 
@@ -2697,7 +2697,7 @@ HB_EXPORT BOOL hb_fsEof( FHANDLE hFileHandle )
 {
 #if defined(__DJGPP__) || defined(__CYGWIN__) || \
     defined(HB_WIN32_IO) || defined(HB_WINCE) || \
-    defined(OS_UNIX_COMPATIBLE)
+    defined(HB_OS_UNIX_COMPATIBLE)
    HB_FOFFSET curPos;
    HB_FOFFSET endPos;
    HB_FOFFSET newPos;
@@ -2738,7 +2738,7 @@ HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree )
 */
 
    if( hb_set.HB_SET_TRIMFILENAME ||
-       hb_set.HB_SET_DIRSEPARATOR != OS_PATH_DELIMITER ||
+       hb_set.HB_SET_DIRSEPARATOR != HB_OS_PATH_DELIM_CHR ||
        hb_set.HB_SET_FILECASE != HB_SET_CASE_MIXED ||
        hb_set.HB_SET_DIRCASE != HB_SET_CASE_MIXED )
    {
@@ -2753,13 +2753,13 @@ HB_EXPORT BYTE * hb_fsNameConv( BYTE * szFileName, BOOL * pfFree )
          *pfFree = TRUE;
       }
 
-      if( hb_set.HB_SET_DIRSEPARATOR != OS_PATH_DELIMITER )
+      if( hb_set.HB_SET_DIRSEPARATOR != HB_OS_PATH_DELIM_CHR )
       {
          BYTE *p = szFileName;
          while( *p )
          {
             if( *p == hb_set.HB_SET_DIRSEPARATOR )
-               *p = OS_PATH_DELIMITER;
+               *p = HB_OS_PATH_DELIM_CHR;
             p++;
          }
       }
diff --git a/harbour/source/rtl/fssize.c b/harbour/source/rtl/fssize.c
index 36f5063523..828d8d79d9 100644
--- a/harbour/source/rtl/fssize.c
+++ b/harbour/source/rtl/fssize.c
@@ -63,7 +63,7 @@
 #  include <sys/stat.h>
 #endif
 
-#if !defined( HB_USE_LARGEFILE64 ) && defined( OS_UNIX_COMPATIBLE )
+#if !defined( HB_USE_LARGEFILE64 ) && defined( HB_OS_UNIX_COMPATIBLE )
    #if defined( __USE_LARGEFILE64 )
       /*
        * The macro: __USE_LARGEFILE64 is set when _LARGEFILE64_SOURCE is
diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c
index 77bb355ea4..50fa56f8ef 100644
--- a/harbour/source/rtl/fstemp.c
+++ b/harbour/source/rtl/fstemp.c
@@ -202,7 +202,7 @@ HB_EXPORT FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix,
       {
          int len;
          len = strlen( ( char * ) pszName );
-         pszName[ len ] = ( BYTE ) OS_PATH_DELIMITER;
+         pszName[ len ] = ( BYTE ) HB_OS_PATH_DELIM_CHR;
          pszName[ len + 1 ] = '\0';
       }
 
diff --git a/harbour/source/rtl/gtos2/gtos2.c b/harbour/source/rtl/gtos2/gtos2.c
index 5d636da8a6..7c1401e8db 100644
--- a/harbour/source/rtl/gtos2/gtos2.c
+++ b/harbour/source/rtl/gtos2/gtos2.c
@@ -113,7 +113,7 @@
 /* convert 16:16 address to 0:32 */
 #define SELTOFLAT(ptr) (void *)(((((ULONG)(ptr))>>19)<<16)|(0xFFFF&((ULONG)(ptr))))
 
-#if defined(HARBOUR_GCC_OS2)
+#if defined(HB_OS_OS2_GCC)
    /* 25/03/2000 - maurilio.longo@libero.it
    OS/2 GCC hasn't got ToolKit headers available */
    #include <stdlib.h>
diff --git a/harbour/source/rtl/gtpca/gtpca.c b/harbour/source/rtl/gtpca/gtpca.c
index 02c8405343..16653cf5df 100644
--- a/harbour/source/rtl/gtpca/gtpca.c
+++ b/harbour/source/rtl/gtpca/gtpca.c
@@ -71,7 +71,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    #include <unistd.h>  /* read() function requires it */
    #include <termios.h>
    #include <sys/ioctl.h>
@@ -120,7 +120,7 @@ static int     s_iOutBufSize = 0;
 static int     s_iOutBufIndex = 0;
 static BYTE *  s_sOutBuf;
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
 
 static volatile BOOL s_fRestTTY = FALSE;
 static struct termios s_saved_TIO, s_curr_TIO;
@@ -233,7 +233,7 @@ static void hb_gt_pca_AnsiGetCurPos( int * iRow, int * iCol )
       hb_gt_pca_termOut( ( BYTE * ) "\x1B[6n", 4 );
       hb_gt_pca_termFlush();
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
       {
          char rdbuf[ 64 ];
          int i, n, y, x;
@@ -462,7 +462,7 @@ static void hb_gt_pca_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
    HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
 
 /* SA_NOCLDSTOP in #if is a hack to detect POSIX compatible environment */
-#if ( defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ ) ) && \
+#if ( defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ ) ) && \
     defined( SA_NOCLDSTOP )
    s_fRestTTY = FALSE;
    if( s_bStdinConsole )
@@ -544,7 +544,7 @@ static void hb_gt_pca_Exit( PHB_GT pGT )
 
    HB_GTSUPER_EXIT( pGT );
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    if( s_fRestTTY )
       tcsetattr( s_hFilenoStdin, TCSANOW, &s_saved_TIO );
 #endif
@@ -570,7 +570,7 @@ static int hb_gt_pca_ReadKey( PHB_GT pGT, int iEventMask )
    HB_SYMBOL_UNUSED( pGT );
    HB_SYMBOL_UNUSED( iEventMask );
 
-#if defined( HARBOUR_GCC_OS2 )
+#if defined( HB_OS_OS2_GCC )
 
    /* Read from the keyboard with no echo, no wait, and no SIGSEV on Ctrl-C */
    ch = _read_kbd( 0, 0, 0 );
@@ -609,7 +609,7 @@ static int hb_gt_pca_ReadKey( PHB_GT pGT, int iEventMask )
       if( _read( s_hFilenoStdin, &bChar, 1 ) == 1 )
          ch = s_keyTransTbl[ bChar ];
    }
-#elif defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#elif defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    {
       BYTE bChar;
       if( hb_fsRead( s_hFilenoStdin, &bChar, 1 ) == 1 )
@@ -687,7 +687,7 @@ static BOOL hb_gt_pca_Suspend( PHB_GT pGT )
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_pca_Suspend(%p)", pGT ) );
 
    HB_SYMBOL_UNUSED( pGT );
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    if( s_fRestTTY )
    {
       tcsetattr( s_hFilenoStdin, TCSANOW, &s_saved_TIO );
@@ -703,7 +703,7 @@ static BOOL hb_gt_pca_Resume( PHB_GT pGT )
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_pca_Resume(%p)", pGT ) );
 
    HB_SYMBOL_UNUSED( pGT );
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    if( s_fRestTTY )
    {
       tcsetattr( s_hFilenoStdin, TCSANOW, &s_curr_TIO );
diff --git a/harbour/source/rtl/gtstd/gtstd.c b/harbour/source/rtl/gtstd/gtstd.c
index 404509af36..edbc5f673b 100644
--- a/harbour/source/rtl/gtstd/gtstd.c
+++ b/harbour/source/rtl/gtstd/gtstd.c
@@ -62,7 +62,7 @@
 #include "hbdate.h"
 #include "hb_io.h"
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    #include <unistd.h>
    #include <termios.h>
    #include <sys/ioctl.h>
@@ -113,7 +113,7 @@ typedef struct _HB_GTSTD
    PHB_CODEPAGE   cdpHost;
    BYTE           keyTransTbl[ 256 ];
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    struct termios saved_TIO;
    struct termios curr_TIO;
    BOOL           fRestTTY;
@@ -124,7 +124,7 @@ typedef struct _HB_GTSTD
 } HB_GTSTD, * PHB_GTSTD;
 
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
 
 static volatile BOOL s_fRestTTY = FALSE;
 
@@ -227,7 +227,7 @@ static void hb_gt_std_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
    HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
 
 /* SA_NOCLDSTOP in #if is a hack to detect POSIX compatible environment */
-#if ( defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ ) ) && \
+#if ( defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ ) ) && \
     defined( SA_NOCLDSTOP )
 
    if( pGTSTD->fStdinConsole )
@@ -315,7 +315,7 @@ static void hb_gt_std_Exit( PHB_GT pGT )
       while( ++pGTSTD->iRow <= iRow )
          hb_gt_std_newLine( pGTSTD );
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
       if( pGTSTD->fRestTTY )
          tcsetattr( pGTSTD->hStdin, TCSANOW, &pGTSTD->saved_TIO );
 #endif
@@ -361,7 +361,7 @@ static int hb_gt_std_ReadKey( PHB_GT pGT, int iEventMask )
       if( _read( pGTSTD->hStdin, &bChar, 1 ) == 1 )
          ch = pGTSTD->keyTransTbl[ bChar ];
    }
-#elif defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#elif defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    {
       struct timeval tv;
       fd_set rfds;
@@ -453,7 +453,7 @@ static BOOL hb_gt_std_Suspend( PHB_GT pGT )
 {
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_std_Suspend(%p)", pGT ) );
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    {
       PHB_GTSTD pGTSTD = HB_GTSTD_GET( pGT );
       if( pGTSTD->fRestTTY )
@@ -469,7 +469,7 @@ static BOOL hb_gt_std_Resume( PHB_GT pGT )
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_std_Resume(%p)", pGT ) );
 
 
-#if defined( OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
+#if defined( HB_OS_UNIX_COMPATIBLE ) || defined( __DJGPP__ )
    {
       PHB_GTSTD pGTSTD = HB_GTSTD_GET( pGT );
       if( pGTSTD->fRestTTY )
diff --git a/harbour/source/rtl/gttrm/gttrm.c b/harbour/source/rtl/gttrm/gttrm.c
index 19e588874c..346487d22d 100644
--- a/harbour/source/rtl/gttrm/gttrm.c
+++ b/harbour/source/rtl/gttrm/gttrm.c
@@ -79,7 +79,7 @@
 #include <string.h>
 #include <fcntl.h>
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
 # include <errno.h>
 # include <time.h>
 # include <unistd.h>
@@ -150,7 +150,7 @@ static HB_GT_FUNCS   SuperTable;
 #define MOUSE_GPM       1
 #define MOUSE_XTERM     2
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
 
 #define TIMEVAL_GET(tv)             gettimeofday(&(tv), NULL)
 #define TIMEVAL_LESS(tv1, tv2)      (((tv1).tv_sec == (tv2).tv_sec ) ?  \
@@ -263,7 +263,7 @@ typedef struct {
    int mbup_row, mbup_col;
    int mbdn_row, mbdn_col;
    /* to analize DBLCLK on xterm */
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    struct timeval BL_time;
    struct timeval BR_time;
    struct timeval BM_time;
@@ -339,7 +339,7 @@ typedef struct _HB_GTTRM
    int      terminal_type;
    int      terminal_ext;
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    struct termios saved_TIO, curr_TIO;
    BOOL     fRestTTY;
 #endif
@@ -388,7 +388,7 @@ typedef struct _HB_GTTRM
 } HB_TERM_STATE, HB_GTTRM, * PHB_GTTRM;
 
 /* static variables use by signal handler */
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    static volatile BOOL s_WinSizeChangeFlag = FALSE;
    static volatile BOOL s_fRestTTY = FALSE;
 #endif
@@ -596,7 +596,7 @@ static int getClipKey( int nKey )
 
 
 /* SA_NOCLDSTOP in #if is a hack to detect POSIX compatible environment */
-#if defined( OS_UNIX_COMPATIBLE ) && defined( SA_NOCLDSTOP )
+#if defined( HB_OS_UNIX_COMPATIBLE ) && defined( SA_NOCLDSTOP )
 
 static void sig_handler( int iSigNo )
 {
@@ -655,7 +655,7 @@ static int hb_gt_trm_getSize( PHB_GTTRM pTerm, int * piRows, int * piCols )
 {
    *piRows = *piCols = 0;
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    if( pTerm->fOutTTY )
    {
       struct winsize win;
@@ -771,7 +771,7 @@ static int add_efds( PHB_GTTRM pTerm, int fd, int mode,
    if( eventFunc == NULL && mode != O_RDONLY )
       return -1;
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    {
       int fl;
       if( ( fl = fcntl( fd, F_GETFL, 0 ) ) == -1 )
@@ -948,7 +948,7 @@ static void chk_mevtdblck( PHB_GTTRM pTerm )
 
    if( newbuttons != 0 )
    {
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
       struct timeval tv;
 #else
       double tv;
@@ -1220,7 +1220,7 @@ static int get_inch( PHB_GTTRM pTerm, int milisec )
                   {
                      unsigned char buf[STDIN_BUFLEN];
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
                      n = read( pTerm->event_fds[i]->fd, buf,
                                STDIN_BUFLEN - pTerm->stdin_inbuf );
 #else
@@ -1324,7 +1324,7 @@ static int wait_key( PHB_GTTRM pTerm, int milisec )
    int nKey, esc, n, i, ch, counter;
    keyTab *ptr;
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    if( s_WinSizeChangeFlag )
    {
       s_WinSizeChangeFlag = FALSE;
@@ -1572,7 +1572,7 @@ static BOOL hb_gt_trm_XtermSetMode( PHB_GTTRM pTerm, int * piRows, int * piCols
    hb_gt_trm_termOut( pTerm, ( BYTE * ) escseq, strlen( escseq ) );
    hb_gt_trm_termFlush( pTerm );
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    /* dirty hack - wait for SIGWINCH */
    if( *piRows != iHeight || *piCols != iWidth )
       sleep( 3 );
@@ -1738,7 +1738,7 @@ static BOOL hb_gt_trm_AnsiGetCursorPos( PHB_GTTRM pTerm, int * iRow, int * iCol,
       n = 0;
       pTerm->fPosAnswer = FALSE;
 
-#ifdef OS_UNIX_COMPATIBLE
+#ifdef HB_OS_UNIX_COMPATIBLE
       {
          struct timeval tv;
          fd_set rdfds;
@@ -2860,7 +2860,7 @@ static void hb_gt_trm_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
    hb_gt_trm_SetTerm( pTerm );
 
 /* SA_NOCLDSTOP in #if is a hack to detect POSIX compatible environment */
-#if defined( OS_UNIX_COMPATIBLE ) && defined( SA_NOCLDSTOP )
+#if defined( HB_OS_UNIX_COMPATIBLE ) && defined( SA_NOCLDSTOP )
 
    if( pTerm->fStdinTTY )
    {
@@ -2955,7 +2955,7 @@ static void hb_gt_trm_Exit( PHB_GT pGT )
 
    if( pTerm )
    {
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
       if( pTerm->fRestTTY )
          tcsetattr( pTerm->hFilenoStdin, TCSANOW, &pTerm->saved_TIO );
 #endif
@@ -3121,7 +3121,7 @@ static BOOL hb_gt_trm_Suspend( PHB_GT pGT )
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_trm_Suspend(%p)", pGT ) );
 
    pTerm = HB_GTTRM_GET( pGT );
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    if( pTerm->fRestTTY )
       tcsetattr( pTerm->hFilenoStdin, TCSANOW, &pTerm->saved_TIO );
 #endif
@@ -3138,7 +3138,7 @@ static BOOL hb_gt_trm_Resume( PHB_GT pGT )
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_trm_Resume(%p)", pGT ) );
 
    pTerm = HB_GTTRM_GET( pGT );
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    if( pTerm->fRestTTY )
       tcsetattr( pTerm->hFilenoStdin, TCSANOW, &pTerm->curr_TIO );
 #endif
diff --git a/harbour/source/rtl/hbffind.c b/harbour/source/rtl/hbffind.c
index 4522cfe388..9aead68b6c 100644
--- a/harbour/source/rtl/hbffind.c
+++ b/harbour/source/rtl/hbffind.c
@@ -161,7 +161,7 @@
 
 #endif
 
-#if !defined( HB_USE_LARGEFILE64 ) && defined( OS_UNIX_COMPATIBLE )
+#if !defined( HB_USE_LARGEFILE64 ) && defined( HB_OS_UNIX_COMPATIBLE )
    #if defined( __USE_LARGEFILE64 )
       /*
        * The macro: __USE_LARGEFILE64 is set when _LARGEFILE64_SOURCE is
@@ -665,7 +665,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
          
          /* hb_strncpy( string, pszFileName, sizeof( string ) - 1 ); */
          hb_strncpy( string, ffind->pszFileMask, sizeof( string ) - 1 ); 
-         pos = strrchr( string, OS_PATH_DELIMITER );
+         pos = strrchr( string, HB_OS_PATH_DELIM_CHR );
          if( pos )
          {
             hb_strncpy( info->pattern, pos + 1, sizeof( info->pattern ) - 1 );
@@ -676,7 +676,7 @@ static BOOL hb_fsFindNextLow( PHB_FFIND ffind )
          {
             hb_strncpy( info->pattern, string, sizeof( info->pattern ) - 1 );
             dirname[ 0 ] = '.';
-            dirname[ 1 ] = OS_PATH_DELIMITER;
+            dirname[ 1 ] = HB_OS_PATH_DELIM_CHR;
             dirname[ 2 ] = '\0';
          }
 
diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c
index 1b183c44ab..35146a6d45 100644
--- a/harbour/source/rtl/hbinet.c
+++ b/harbour/source/rtl/hbinet.c
@@ -65,7 +65,7 @@
 #include "hbapierr.h"
 
 /* Compile in Unix mode under Cygwin */
-#ifdef OS_UNIX_COMPATIBLE
+#ifdef HB_OS_UNIX_COMPATIBLE
   #undef HB_OS_WIN_32
 #endif
 
@@ -180,7 +180,7 @@
    #include <errno.h>
 #endif
 
-#if defined( HB_OS_UNIX ) || defined( OS_UNIX_COMPATIBLE ) || defined( HB_OS_BSD ) || defined(HB_OS_OS2)
+#if defined( HB_OS_UNIX ) || defined( HB_OS_UNIX_COMPATIBLE ) || defined( HB_OS_BSD ) || defined(HB_OS_OS2)
    #include <sys/time.h>
 #endif
 
diff --git a/harbour/source/rtl/memofile.c b/harbour/source/rtl/memofile.c
index fa20ddc1e4..0e535db8a0 100644
--- a/harbour/source/rtl/memofile.c
+++ b/harbour/source/rtl/memofile.c
@@ -76,7 +76,7 @@ HB_FUNC( MEMOREAD )
 
             /* Don't read the file terminating EOF character */
 
-            #if ! defined(OS_UNIX_COMPATIBLE)
+            #if ! defined(HB_OS_UNIX_COMPATIBLE)
             {
                BYTE byEOF = HB_CHAR_NUL;
 
@@ -125,7 +125,7 @@ static BOOL hb_memowrit( BOOL bWriteEOF )
 
          /* NOTE: CA-Cl*pper will add the EOF even if the write failed. [vszakats] */
          /* NOTE: CA-Cl*pper will not return .F. when the EOF could not be written. [vszakats] */
-#if ! defined(OS_UNIX_COMPATIBLE)
+#if ! defined(HB_OS_UNIX_COMPATIBLE)
          if( bWriteEOF )  /* if true, then write EOF */
          {
             BYTE byEOF = HB_CHAR_EOF;
diff --git a/harbour/source/rtl/philes.c b/harbour/source/rtl/philes.c
index a129dea8b5..5951eadc2d 100644
--- a/harbour/source/rtl/philes.c
+++ b/harbour/source/rtl/philes.c
@@ -297,25 +297,25 @@ HB_FUNC( HB_OSERROR )
 
 HB_FUNC( HB_OSPATHSEPARATOR )
 {
-   const char ret[ 2 ] = { OS_PATH_DELIMITER, 0 };
+   const char ret[ 2 ] = { HB_OS_PATH_DELIM_CHR, 0 };
    hb_retc( ret );
 }
 
 HB_FUNC( HB_OSPATHLISTSEPARATOR )
 {
-   const char ret[ 2 ] = { OS_PATH_LIST_SEPARATOR, 0 };
+   const char ret[ 2 ] = { HB_OS_PATH_LIST_SEP_CHR, 0 };
    hb_retc( ret );
 }
 
 HB_FUNC( HB_OSPATHDELIMITERS )
 {
-   hb_retc( OS_PATH_DELIMITER_LIST );
+   hb_retc( HB_OS_PATH_DELIM_CHR_LIST );
 }
 
 HB_FUNC( HB_OSDRIVESEPARATOR )
 {
-#ifdef OS_HAS_DRIVE_LETTER
-   const char ret[ 2 ] = { OS_DRIVE_DELIMITER, 0 };
+#ifdef HB_OS_HAS_DRIVE_LETTER
+   const char ret[ 2 ] = { HB_OS_DRIVE_DELIM_CHR, 0 };
    hb_retc( ret );
 #else
    hb_retc( NULL );
@@ -324,5 +324,5 @@ HB_FUNC( HB_OSDRIVESEPARATOR )
 
 HB_FUNC( HB_OSFILEMASK )
 {
-   hb_retc( OS_FILE_MASK );
+   hb_retc( HB_OS_ALLFILE_MASK );
 }
diff --git a/harbour/source/rtl/seconds.c b/harbour/source/rtl/seconds.c
index bb62407247..c6f2efb37d 100644
--- a/harbour/source/rtl/seconds.c
+++ b/harbour/source/rtl/seconds.c
@@ -62,7 +62,7 @@
 #elif !( defined( HB_WINCE ) && defined( _MSC_VER ) )
    #include <sys/timeb.h>
 #endif
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    #include <sys/times.h>
    #include <unistd.h>
 #endif
@@ -246,14 +246,14 @@ HB_FUNC( HB_CLOCKS2SECS )
 HB_EXPORT double hb_secondsCPU( int n )
 {
    double d = 0.0;
-#if defined( HB_OS_WIN_32 ) && !defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_WIN_32 ) && !defined( HB_OS_UNIX_COMPATIBLE )
    FILETIME Create, Exit, Kernel, User;
 #endif
 
    if( ( n < 1 || n > 3 ) && ( n < 11 || n > 13 ) )
       n = 3;
 
-#if defined( OS_UNIX_COMPATIBLE )
+#if defined( HB_OS_UNIX_COMPATIBLE )
    {
       struct tms tm;
 
diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c
index 9324f425b4..156d67f24b 100644
--- a/harbour/source/rtl/set.c
+++ b/harbour/source/rtl/set.c
@@ -207,7 +207,7 @@ static FHANDLE open_handle( char * file_name, BOOL bAppend, char * def_ext, HB_s
    HB_TRACE(HB_TR_DEBUG, ("open_handle(%s, %d, %s, %d)", file_name, (int) bAppend, def_ext, (int) set_specifier));
 
    /* Create full filename */
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
    bPipe = set_specifier == HB_SET_PRINTFILE && file_name[ 0 ] == '|';
    if( bPipe )
    {
@@ -975,7 +975,7 @@ void hb_setInitialize( void )
    hb_set.HB_SET_DELIMCHARS = hb_strdup( "::" );
    hb_set.HB_SET_DELIMITERS = FALSE;
    hb_set.HB_SET_DEVICE = hb_strdup( "SCREEN" );
-#if defined(OS_UNIX_COMPATIBLE)
+#if defined(HB_OS_UNIX_COMPATIBLE)
    hb_set.HB_SET_EOF = FALSE;
 #else
    hb_set.HB_SET_EOF = TRUE;
@@ -1022,7 +1022,7 @@ void hb_setInitialize( void )
    hb_set.HB_SET_UNIQUE = FALSE;
    hb_set.HB_SET_FILECASE = HB_SET_CASE_MIXED;
    hb_set.HB_SET_DIRCASE = HB_SET_CASE_MIXED;
-   hb_set.HB_SET_DIRSEPARATOR = OS_PATH_DELIMITER;
+   hb_set.HB_SET_DIRSEPARATOR = HB_OS_PATH_DELIM_CHR;
    hb_set.HB_SET_VIDEOMODE = 0;
    hb_set.HB_SET_WRAP = FALSE;
    hb_set.HB_SET_DBFLOCKSCHEME = 0;
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 824b452456..17c6f16137 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -431,19 +431,19 @@ HB_EXPORT void hb_vmInit( BOOL bStartMainProc )
 
       if( pDynSym && pDynSym->pSymbol->value.pFunPtr )
          s_pSymStart = pDynSym->pSymbol;
-#ifdef HARBOUR_START_PROCEDURE
+#ifdef HB_START_PROCEDURE
       else
       {
          /* if first char is '@' then start procedure were set by
             programmer explicitly and should have the highest priority
             in other case it's the name of first public function in
             first linked moudule which is used if there is no
-            HARBOUR_START_PROCEDURE in code */
+            HB_START_PROCEDURE in code */
          if( s_pszLinkedMain && *s_pszLinkedMain == '@' )
             pDynSym = hb_dynsymFind( s_pszLinkedMain + 1 );
          else
          {
-            pDynSym = hb_dynsymFind( HARBOUR_START_PROCEDURE );
+            pDynSym = hb_dynsymFind( HB_START_PROCEDURE );
 
             if( ! ( pDynSym && pDynSym->pSymbol->value.pFunPtr ) && s_pszLinkedMain )
                pDynSym = hb_dynsymFind( s_pszLinkedMain );
@@ -452,7 +452,7 @@ HB_EXPORT void hb_vmInit( BOOL bStartMainProc )
          if( pDynSym && pDynSym->pSymbol->value.pFunPtr )
             s_pSymStart = pDynSym->pSymbol;
          else
-            hb_errInternal( HB_EI_VMBADSTARTUP, NULL, HARBOUR_START_PROCEDURE, NULL );
+            hb_errInternal( HB_EI_VMBADSTARTUP, NULL, HB_START_PROCEDURE, NULL );
       }
 #else
       else if( s_pszLinkedMain )
diff --git a/harbour/source/vm/main.c b/harbour/source/vm/main.c
index 06118b5065..b14e2eb291 100644
--- a/harbour/source/vm/main.c
+++ b/harbour/source/vm/main.c
@@ -55,9 +55,9 @@
 
 #include "hbsetup.h"
 
-#if   defined(HARBOUR_MAIN_STD)
+#if   defined(HB_MAIN_STD)
    #include "mainstd.c"
-#elif defined(HARBOUR_MAIN_WIN)
+#elif defined(HB_MAIN_WIN)
    #include "mainwin.c"
 #else
    #include "mainstd.c" /* Use the standard ANSI C entry point if not speficied */