diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c
index a153e1cd01..5cfe4fc75d 100644
--- a/harbour/source/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c
@@ -95,12 +95,12 @@ typedef struct _DBFMEMO
 typedef DBFMEMO * LPDBFMEMO;
 
 
-HARBOUR HB__DBFCDX( void );
-HARBOUR HB_DBFCDX_GETFUNCTABLE( void );
+HB_FUNC( _DBFCDX );
+HB_FUNC( DBFCDX_GETFUNCTABLE );
 
 HB_INIT_SYMBOLS_BEGIN( dbfcdx1__InitSymbols )
-{ "_DBFCDX",             _HB_FS_PUBLIC, HB__DBFCDX,             0 },
-{ "DBFCDX_GETFUNCTABLE", _HB_FS_PUBLIC, HB_DBFCDX_GETFUNCTABLE, 0 }
+{ "_DBFCDX",             HB_FS_PUBLIC, HB_FUNCNAME( _DBFCDX ), NULL },
+{ "DBFCDX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFCDX_GETFUNCTABLE ), NULL }
 HB_INIT_SYMBOLS_END( dbfcdx1__InitSymbols )
 #if ! defined(__GNUC__) && ! defined(_MSC_VER)
    #pragma startup dbfcdx1__InitSymbols
@@ -924,11 +924,11 @@ static RDDFUNCS cdxTable = { cdxBof,
                              cdxWhoCares
                            };
 
-HARBOUR HB__DBFCDX( void )
+HB_FUNC( _DBFCDX )
 {
 }
 
-HARBOUR HB_DBFCDX_GETFUNCTABLE( void )
+HB_FUNC( DBFCDX_GETFUNCTABLE )
 {
    RDDFUNCS * pTable;
    USHORT * uiCount;
diff --git a/harbour/source/rdd/dbfntx/dbfntx1.c b/harbour/source/rdd/dbfntx/dbfntx1.c
index 73960c4878..f952346203 100644
--- a/harbour/source/rdd/dbfntx/dbfntx1.c
+++ b/harbour/source/rdd/dbfntx/dbfntx1.c
@@ -41,12 +41,12 @@
 #include "hbapirdd.h"
 #include "rddsys.ch"
 
-HARBOUR HB__DBFNTX( void );
-HARBOUR HB_DBFNTX_GETFUNCTABLE( void );
+HB_FUNC( _DBFNTX );
+HB_FUNC( DBFNTX_GETFUNCTABLE );
 
 HB_INIT_SYMBOLS_BEGIN( dbfntx1__InitSymbols )
-{ "_DBFNTX",             _HB_FS_PUBLIC, HB__DBFNTX,             0 },
-{ "DBFNTX_GETFUNCTABLE", _HB_FS_PUBLIC, HB_DBFNTX_GETFUNCTABLE, 0 }
+{ "_DBFNTX",             HB_FS_PUBLIC, HB_FUNCNAME( _DBFNTX ), NULL },
+{ "DBFNTX_GETFUNCTABLE", HB_FS_PUBLIC, HB_FUNCNAME( DBFNTX_GETFUNCTABLE ), NULL }
 HB_INIT_SYMBOLS_END( dbfntx1__InitSymbols )
 #if ! defined(__GNUC__) && ! defined(_MSC_VER)
    #pragma startup dbfntx1__InitSymbols
@@ -60,11 +60,11 @@ static RDDFUNCS ntxSuper = { 0 };
 
 static RDDFUNCS ntxTable = { 0 };
 
-HARBOUR HB__DBFNTX( void )
+HB_FUNC( _DBFNTX )
 {
 }
 
-HARBOUR HB_DBFNTX_GETFUNCTABLE( void )
+HB_FUNC( DBFNTX_GETFUNCTABLE )
 {
    RDDFUNCS * pTable;
    USHORT * uiCount;
diff --git a/harbour/source/rtl/Makefile b/harbour/source/rtl/Makefile
index 518debf283..346bd8ee5a 100644
--- a/harbour/source/rtl/Makefile
+++ b/harbour/source/rtl/Makefile
@@ -56,6 +56,7 @@ C_SOURCES=\
         mlpos.c      \
         mod.c        \
         mouseapi.c   \
+        mousex.c     \
         mtran.c      \
         natmsg.c     \
         net.c        \
diff --git a/harbour/source/rtl/abs.c b/harbour/source/rtl/abs.c
index abf1da0e67..bd9bbb0c47 100644
--- a/harbour/source/rtl/abs.c
+++ b/harbour/source/rtl/abs.c
@@ -37,7 +37,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_ABS( void )
+HB_FUNC( ABS )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
 
diff --git a/harbour/source/rtl/accept.c b/harbour/source/rtl/accept.c
index 7c6376b721..04e430127d 100644
--- a/harbour/source/rtl/accept.c
+++ b/harbour/source/rtl/accept.c
@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB___ACCEPTSTR()
+ *    __ACCEPTSTR()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -48,20 +48,20 @@
 #include "hbapigt.h"
 #include "inkey.ch"
 
-extern HARBOUR HB_QOUT( void );
+extern HB_FUNC( QOUT );
 
 #define ACCEPT_BUFFER_LEN 256 /* length of input buffer for ACCEPT command */
 
 static char s_szAcceptResult[ ACCEPT_BUFFER_LEN ] = { '\0' };
 
-HARBOUR HB___ACCEPT( void )
+HB_FUNC( __ACCEPT )
 {
    int input;
    ULONG ulLen;
 
    /* cPrompt(s) passed ? */
    if( hb_pcount() >= 1 )
-      HB_QOUT();
+      HB_FUNCNAME( QOUT )();
 
    ulLen = 0;
    input = 0;
@@ -96,7 +96,7 @@ HARBOUR HB___ACCEPT( void )
    hb_retc( s_szAcceptResult );
 }
 
-HARBOUR HB___ACCEPTSTR( void )
+HB_FUNC( __ACCEPTSTR )
 {
    hb_retc( s_szAcceptResult );
 }
diff --git a/harbour/source/rtl/ampm.c b/harbour/source/rtl/ampm.c
index 464104342a..36e2bade71 100644
--- a/harbour/source/rtl/ampm.c
+++ b/harbour/source/rtl/ampm.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_AMPM( void )
+HB_FUNC( AMPM )
 {
    char * pszTime = hb_parc( 1 );
    ULONG  ulTimeLen = hb_parclen( 1 );
diff --git a/harbour/source/rtl/at.c b/harbour/source/rtl/at.c
index b3603cfbf9..668f5172c7 100644
--- a/harbour/source/rtl/at.c
+++ b/harbour/source/rtl/at.c
@@ -40,7 +40,7 @@
 /* locates a substring in a string */
 /* TEST: QOUT( "at( 'cde', 'abcdefgfedcba' ) = '" + at( 'cde', 'abcsefgfedcba' ) + "'" ) */
 
-HARBOUR HB_AT( void )
+HB_FUNC( AT )
 {
    PHB_ITEM pSub = hb_param( 1, IT_STRING );
    PHB_ITEM pText = hb_param( 2, IT_STRING );
diff --git a/harbour/source/rtl/binnum.c b/harbour/source/rtl/binnum.c
index d435f94b76..b929863a29 100644
--- a/harbour/source/rtl/binnum.c
+++ b/harbour/source/rtl/binnum.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_BIN2W( void )
+HB_FUNC( BIN2W )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -56,7 +56,7 @@ HARBOUR HB_BIN2W( void )
       hb_retni( 0 );
 }
 
-HARBOUR HB_BIN2I( void )
+HB_FUNC( BIN2I )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -76,7 +76,7 @@ HARBOUR HB_BIN2I( void )
       hb_retni( 0 );
 }
 
-HARBOUR HB_BIN2L( void )
+HB_FUNC( BIN2L )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -100,7 +100,7 @@ HARBOUR HB_BIN2L( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_I2BIN( void )
+HB_FUNC( I2BIN )
 {
    char szString[ 2 ];
 
@@ -120,7 +120,7 @@ HARBOUR HB_I2BIN( void )
    hb_retclen( szString, 2 );
 }
 
-HARBOUR HB_L2BIN( void )
+HB_FUNC( L2BIN )
 {
    char szString[ 4 ];
 
diff --git a/harbour/source/rtl/binnumx.c b/harbour/source/rtl/binnumx.c
index 232c648204..a8e9298411 100644
--- a/harbour/source/rtl/binnumx.c
+++ b/harbour/source/rtl/binnumx.c
@@ -40,7 +40,7 @@
 
 #ifdef HB_COMPAT_XPP
 
-HARBOUR HB_BIN2U( void )
+HB_FUNC( BIN2U )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -64,7 +64,7 @@ HARBOUR HB_BIN2U( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_W2BIN( void )
+HB_FUNC( W2BIN )
 {
    char szString[ 2 ];
 
@@ -84,7 +84,7 @@ HARBOUR HB_W2BIN( void )
    hb_retclen( szString, 2 );
 }
 
-HARBOUR HB_U2BIN( void )
+HB_FUNC( U2BIN )
 {
    char szString[ 4 ];
 
diff --git a/harbour/source/rtl/box.c b/harbour/source/rtl/box.c
index f2c24dbfbc..da44329cee 100644
--- a/harbour/source/rtl/box.c
+++ b/harbour/source/rtl/box.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_DISPBOX( void )
+HB_FUNC( DISPBOX )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
    {
diff --git a/harbour/source/rtl/chrasc.c b/harbour/source/rtl/chrasc.c
index 3c11e9f0f2..d69b968491 100644
--- a/harbour/source/rtl/chrasc.c
+++ b/harbour/source/rtl/chrasc.c
@@ -40,7 +40,7 @@
 #include "hbapierr.h"
 
 /* converts an ASCII code to a character value */
-HARBOUR HB_CHR( void )
+HB_FUNC( CHR )
 {
    if( ISNUM( 1 ) )
    {
@@ -70,7 +70,7 @@ HARBOUR HB_CHR( void )
 }
 
 /* converts a character value to an ASCII code */
-HARBOUR HB_ASC( void )
+HB_FUNC( ASC )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/colorind.c b/harbour/source/rtl/colorind.c
index f9e02a9332..9fb43ad71b 100644
--- a/harbour/source/rtl/colorind.c
+++ b/harbour/source/rtl/colorind.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_HB_COLORINDEX( void )
+HB_FUNC( HB_COLORINDEX )
 {
    if( ISCHAR( 1 ) && ISNUM( 2 ) )
    {
diff --git a/harbour/source/rtl/console.c b/harbour/source/rtl/console.c
index a1e99462d6..0aa74ac6e4 100644
--- a/harbour/source/rtl/console.c
+++ b/harbour/source/rtl/console.c
@@ -38,15 +38,15 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 David G. Holm <dholm@jsd-llc.com>
- *    hb_altout(), hb_devout(), HB_DEVOUT(), hb_devpos(),
- *    HB_DEVPOS(), hb_dispout(), HB___EJECT(), 
- *    hb_out(), hb_outerr(), HB_OUTERR(),
- *    hb_outstd(), HB_OUTSTD(), HB_PCOL(), HB_PROW(),
- *    HB_SETPRC(), and hb_consoleInitialize()
+ *    hb_altout(), hb_devout(), DEVOUT(), hb_devpos(),
+ *    DEVPOS(), hb_dispout(), __EJECT(), 
+ *    hb_out(), hb_outerr(), OUTERR(),
+ *    hb_outstd(), OUTSTD(), PCOL(), PROW(),
+ *    SETPRC(), and hb_consoleInitialize()
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
  *    hb_consoleGetNewLine()
- *    HB_DISPOUTAT()
+ *    DISPOUTAT()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -144,7 +144,7 @@ char * hb_consoleGetNewLine( void )
    return s_szCrLf;
 }
 
-HARBOUR HB_HB_OSNEWLINE( void )
+HB_FUNC( HB_OSNEWLINE )
 {
    hb_retc( s_szCrLf );
 }
@@ -315,13 +315,13 @@ void hb_devpos( SHORT row, SHORT col )
 
 /* NOTE: This should be placed after the hb_devpos() definition. */
 
-HARBOUR HB_DEVPOS( void ) /* Sets the screen and/or printer position */
+HB_FUNC( DEVPOS ) /* Sets the screen and/or printer position */
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_devpos( hb_parni( 1 ), hb_parni( 2 ) );
 }
 
-HARBOUR HB_OUTSTD( void ) /* writes a list of values to the standard output device */
+HB_FUNC( OUTSTD ) /* writes a list of values to the standard output device */
 {
    USHORT uiPCount = hb_pcount();
    USHORT uiParam;
@@ -334,7 +334,7 @@ HARBOUR HB_OUTSTD( void ) /* writes a list of values to the standard output devi
    }
 }
 
-HARBOUR HB_OUTERR( void ) /* writes a list of values to the standard error device */
+HB_FUNC( OUTERR ) /* writes a list of values to the standard error device */
 {
    USHORT uiPCount = hb_pcount();
    USHORT uiParam;
@@ -347,7 +347,7 @@ HARBOUR HB_OUTERR( void ) /* writes a list of values to the standard error devic
    }
 }
 
-HARBOUR HB_QQOUT( void ) /* writes a list of values to the current device (screen or printer) and is affected by SET ALTERNATE */
+HB_FUNC( QQOUT ) /* writes a list of values to the current device (screen or printer) and is affected by SET ALTERNATE */
 {
    USHORT uiPCount = hb_pcount();
    USHORT uiParam;
@@ -360,7 +360,7 @@ HARBOUR HB_QQOUT( void ) /* writes a list of values to the current device (scree
    }
 }
 
-HARBOUR HB_QOUT( void )
+HB_FUNC( QOUT )
 {
    hb_altout( s_szCrLf, CRLF_BUFFER_LEN - 1 );
 
@@ -377,10 +377,10 @@ HARBOUR HB_QOUT( void )
       hb_fsSetError( user_ferror ); /* Restore last user file error code */
    }
 
-   HB_QQOUT();
+   HB_FUNCNAME( QQOUT )();
 }
 
-HARBOUR HB_DEVOUT( void ) /* writes a single value to the current device (screen or printer), but is not affected by SET ALTERNATE */
+HB_FUNC( DEVOUT ) /* writes a single value to the current device (screen or printer), but is not affected by SET ALTERNATE */
 {
    if( hb_pcount() >= 1 )
    {
@@ -402,7 +402,7 @@ HARBOUR HB_DEVOUT( void ) /* writes a single value to the current device (screen
 
 /* TOFIX: CA-Cl*pper will print an eject even if SET DEVICE=SCREEN */
 
-HARBOUR HB___EJECT( void ) /* Ejects the current page from the printer */
+HB_FUNC( __EJECT ) /* Ejects the current page from the printer */
 {
    if( hb_stricmp( hb_set.HB_SET_DEVICE, "PRINTER" ) == 0 && hb_set.hb_set_printhan != FS_ERROR )
    {
@@ -414,17 +414,17 @@ HARBOUR HB___EJECT( void ) /* Ejects the current page from the printer */
    s_uiPRow = s_uiPCol = 0;
 }
 
-HARBOUR HB_PROW( void ) /* Returns the current printer row position */
+HB_FUNC( PROW ) /* Returns the current printer row position */
 {
    hb_retni( s_uiPRow );
 }
 
-HARBOUR HB_PCOL( void ) /* Returns the current printer row position */
+HB_FUNC( PCOL ) /* Returns the current printer row position */
 {
    hb_retni( s_uiPCol );
 }
 
-HARBOUR HB_SETPRC( void ) /* Sets the current printer row and column positions */
+HB_FUNC( SETPRC ) /* Sets the current printer row and column positions */
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
    {
@@ -433,7 +433,7 @@ HARBOUR HB_SETPRC( void ) /* Sets the current printer row and column positions *
    }
 }
 
-HARBOUR HB_DISPOUT( void ) /* writes a single value to the screen, but is not affected by SET ALTERNATE */
+HB_FUNC( DISPOUT ) /* writes a single value to the screen, but is not affected by SET ALTERNATE */
 {
    if( hb_pcount() >= 1 )
    {
@@ -455,7 +455,7 @@ HARBOUR HB_DISPOUT( void ) /* writes a single value to the screen, but is not af
 
 /* Undocumented Clipper function */
 
-HARBOUR HB_DISPOUTAT( void ) /* writes a single value to the screen at speficic position, but is not affected by SET ALTERNATE */
+HB_FUNC( DISPOUTAT ) /* writes a single value to the screen at speficic position, but is not affected by SET ALTERNATE */
 {
    if( hb_pcount() >= 3 )
    {
diff --git a/harbour/source/rtl/copyfile.c b/harbour/source/rtl/copyfile.c
index 78855f13f7..6433bb0a16 100644
--- a/harbour/source/rtl/copyfile.c
+++ b/harbour/source/rtl/copyfile.c
@@ -116,7 +116,7 @@ static BOOL hb_fsCopy( char * szSource, char * szDest )
 
 /* Clipper returns .F. on failure and NIL on success */
 
-HARBOUR HB___COPYFILE( void )
+HB_FUNC( __COPYFILE )
 {
    if( ISCHAR( 1 ) && ISCHAR( 2 ) )
    {
diff --git a/harbour/source/rtl/datec.c b/harbour/source/rtl/datec.c
index 1cf565cdb4..88bfd163ce 100644
--- a/harbour/source/rtl/datec.c
+++ b/harbour/source/rtl/datec.c
@@ -52,7 +52,7 @@ char * hb_cdow( int iDay )
    return ( iDay >= 1 && iDay <= 7 ) ? hb_daysname[ iDay - 1 ] : "";
 }
 
-HARBOUR HB_CMONTH( void )
+HB_FUNC( CMONTH )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -75,7 +75,7 @@ HARBOUR HB_CMONTH( void )
    }
 }
 
-HARBOUR HB_CDOW( void )
+HB_FUNC( CDOW )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
diff --git a/harbour/source/rtl/dateshb.c b/harbour/source/rtl/dateshb.c
index 5f3379d60a..2301e4f9a5 100644
--- a/harbour/source/rtl/dateshb.c
+++ b/harbour/source/rtl/dateshb.c
@@ -38,17 +38,17 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Jose Lalin <dezac@corevia.com>
- *    HB_DAY()
- *    HB_MONTH()
- *    HB_YEAR()
- *    HB_DOW()
+ *    DAY()
+ *    MONTH()
+ *    YEAR()
+ *    DOW()
  *
  * Copyright 1999 David G. Holm <dholm@jsd-llc.com>
- *    HB_CTOD()
- *    HB_DATE()
+ *    CTOD()
+ *    DATE()
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_HB_STOD()
+ *    HB_STOD()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -73,7 +73,7 @@
    #include <dos.h>
 #endif
 
-HARBOUR HB_CTOD( void )
+HB_FUNC( CTOD )
 {
    if( ISCHAR( 1 ) )
    {
@@ -169,7 +169,7 @@ HARBOUR HB_CTOD( void )
    }
 }
 
-HARBOUR HB_DTOC( void )
+HB_FUNC( DTOC )
 {
    if( ISDATE( 1 ) )
    {
@@ -190,7 +190,7 @@ HARBOUR HB_DTOC( void )
    }
 }
 
-HARBOUR HB_DTOS( void )
+HB_FUNC( DTOS )
 {
    if( ISDATE( 1 ) )
    {
@@ -212,12 +212,12 @@ HARBOUR HB_DTOS( void )
 
 /* NOTE: Harbour extension, exactly the same as STOD(). */
 
-HARBOUR HB_HB_STOD( void )
+HB_FUNC( HB_STOD )
 {
    hb_retds( hb_parc( 1 ) );
 }
 
-HARBOUR HB_YEAR( void )
+HB_FUNC( YEAR )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -241,7 +241,7 @@ HARBOUR HB_YEAR( void )
    }
 }
 
-HARBOUR HB_MONTH( void )
+HB_FUNC( MONTH )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -265,7 +265,7 @@ HARBOUR HB_MONTH( void )
    }
 }
 
-HARBOUR HB_DAY( void )
+HB_FUNC( DAY )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
@@ -289,7 +289,7 @@ HARBOUR HB_DAY( void )
    }
 }
 
-HARBOUR HB_TIME( void )
+HB_FUNC( TIME )
 {
    char szResult[ 9 ];
 
@@ -309,7 +309,7 @@ HARBOUR HB_TIME( void )
    hb_retclen( szResult, 8 );
 }
 
-HARBOUR HB_DATE( void )
+HB_FUNC( DATE )
 {
    char szResult[ 9 ];
 
@@ -329,7 +329,7 @@ HARBOUR HB_DATE( void )
    hb_retds( szResult );
 }
 
-HARBOUR HB_DOW( void )
+HB_FUNC( DOW )
 {
    PHB_ITEM pDate = hb_param( 1, IT_DATE );
 
diff --git a/harbour/source/rtl/datesx.c b/harbour/source/rtl/datesx.c
index 6f93ad1357..fd17b074a1 100644
--- a/harbour/source/rtl/datesx.c
+++ b/harbour/source/rtl/datesx.c
@@ -40,7 +40,7 @@
 /* NOTE: XBase++ compatible function */
 /* NOTE: XBase++ checks for the parameter count at compile time */
 
-HARBOUR HB_STOD( void )
+HB_FUNC( STOD )
 {
    hb_retds( hb_parc( 1 ) );
 }
diff --git a/harbour/source/rtl/defpath.c b/harbour/source/rtl/defpath.c
index 40d7512635..6f02444133 100644
--- a/harbour/source/rtl/defpath.c
+++ b/harbour/source/rtl/defpath.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbset.h"
 
-HARBOUR HB_DEFPATH( void )
+HB_FUNC( DEFPATH )
 {
    char buffer[ _POSIX_PATH_MAX ];
    char delimiter[ 2 ] = ":";
@@ -70,8 +70,8 @@ HARBOUR HB_DEFPATH( void )
    hb_retc( buffer );
 }
 
-HARBOUR HB___DEFPATH( void )
+HB_FUNC( __DEFPATH )
 {
-   HB_DEFPATH();
+   HB_FUNCNAME( DEFPATH )();
 }
 
diff --git a/harbour/source/rtl/descend.c b/harbour/source/rtl/descend.c
index 56dd8f8630..86588bf249 100644
--- a/harbour/source/rtl/descend.c
+++ b/harbour/source/rtl/descend.c
@@ -49,7 +49,7 @@ void hb_strDescend( char * szStringTo, const char * szStringFrom, ULONG ulLen )
    }
 }
 
-HARBOUR HB_DESCEND( void )
+HB_FUNC( DESCEND )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 
diff --git a/harbour/source/rtl/dir.c b/harbour/source/rtl/dir.c
index ad0f37e779..0093202e07 100644
--- a/harbour/source/rtl/dir.c
+++ b/harbour/source/rtl/dir.c
@@ -344,7 +344,7 @@ static BYTE * HarbourMaskToAttributes( USHORT usMask, BYTE * byAttrib )
 
 /* NOTE: The third (lEightDotThree) parameter is a Harbour extension. */
 
-HARBOUR HB_DIRECTORY( void )
+HB_FUNC( DIRECTORY )
 {
 #if defined(HAVE_POSIX_IO)
 
diff --git a/harbour/source/rtl/dirdrive.c b/harbour/source/rtl/dirdrive.c
index 8fb2ad928b..62a110e920 100644
--- a/harbour/source/rtl/dirdrive.c
+++ b/harbour/source/rtl/dirdrive.c
@@ -42,7 +42,7 @@
 
 /* NOTE: Clipper 5.3 only */
 
-HARBOUR HB_DIRCHANGE( void )
+HB_FUNC( DIRCHANGE )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -58,7 +58,7 @@ HARBOUR HB_DIRCHANGE( void )
 /* NOTE: Clipper 5.3 NG incorrectly states that the name if this function is
          DIRMAKE(), in reality it's not. */
 
-HARBOUR HB_MAKEDIR( void )
+HB_FUNC( MAKEDIR )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -72,7 +72,7 @@ HARBOUR HB_MAKEDIR( void )
 
 /* NOTE: Clipper 5.3 only */
 
-HARBOUR HB_DIRREMOVE( void )
+HB_FUNC( DIRREMOVE )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -86,7 +86,7 @@ HARBOUR HB_DIRREMOVE( void )
 
 /* NOTE: Clipper 5.3 undocumented */
 
-HARBOUR HB_ISDISK()
+HB_FUNC( ISDISK )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -97,7 +97,7 @@ HARBOUR HB_ISDISK()
    hb_fsSetError( uiErrorOld );
 }
 
-HARBOUR HB_DISKCHANGE( void )
+HB_FUNC( DISKCHANGE )
 {
    USHORT uiErrorOld = hb_fsError();
 
@@ -108,7 +108,7 @@ HARBOUR HB_DISKCHANGE( void )
    hb_fsSetError( uiErrorOld );
 }
 
-HARBOUR HB_DISKNAME( void )
+HB_FUNC( DISKNAME )
 {
    USHORT uiErrorOld = hb_fsError();
    char szDrive[ 1 ];
diff --git a/harbour/source/rtl/do.c b/harbour/source/rtl/do.c
index 8f22a757a3..8b14e6ce69 100644
--- a/harbour/source/rtl/do.c
+++ b/harbour/source/rtl/do.c
@@ -38,7 +38,7 @@
 #include "hbapierr.h"
 #include "hbvm.h"
 
-HARBOUR HB_DO( void )
+HB_FUNC( DO )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 
diff --git a/harbour/source/rtl/empty.c b/harbour/source/rtl/empty.c
index 3969c4115a..a9e41926ef 100644
--- a/harbour/source/rtl/empty.c
+++ b/harbour/source/rtl/empty.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_EMPTY( void )
+HB_FUNC( EMPTY )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 
diff --git a/harbour/source/rtl/environ.c b/harbour/source/rtl/environ.c
index 72287fadf9..3897410f49 100644
--- a/harbour/source/rtl/environ.c
+++ b/harbour/source/rtl/environ.c
@@ -94,7 +94,7 @@
    #endif
 #endif
 
-HARBOUR HB_OS( void )
+HB_FUNC( OS )
 {
    char * cformat = "%s %d.%02d%c";
 
@@ -489,7 +489,7 @@ char * hb_version( USHORT uiMode )
    return pszVersion;
 }
 
-HARBOUR HB_VERSION( void )
+HB_FUNC( VERSION )
 {
    char * pszVersion = hb_version( hb_pcount() > 0 ? 1 : 0 );
    hb_retc( pszVersion );
diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c
index d9a98d663a..bbc688b81d 100644
--- a/harbour/source/rtl/errorapi.c
+++ b/harbour/source/rtl/errorapi.c
@@ -38,15 +38,15 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB___ERRINHANDLER()
- *    HB_DOSERROR()
+ *    DOSERROR()
+ *    __ERRINHANDLER()
+ *    __ERRRT_BASE()
  *    hb_errLaunch()
  *    hb_errLaunchSubst()
  *    hb_errGetFlags()
  *    hb_errPutFlags()
  *    hb_errRT_New()
  *    hb_errRT_New_Subst()
- *    HB___ERRRT_BASE()
  *    hb_errRT_BASE()
  *    hb_errRT_BASE_Ext1()
  *    hb_errRT_BASE_Subst()
@@ -73,7 +73,7 @@ static HB_ITEM s_errorBlock;
 static int     s_iLaunchCount = 0;
 static USHORT  s_uiErrorDOS = 0; /* The value of DOSERROR() */
 
-extern HARBOUR HB_ERRORNEW( void );
+extern HB_FUNC( ERRORNEW );
 
 /* NOTE: This is called via its symbol name, so we should make sure
          that it gets linked. WARNING ! DON'T make this function static. 
@@ -82,18 +82,18 @@ void hb_errForceLink()
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_errForceLink()"));
 
-   HB_ERRORNEW();
+   HB_FUNCNAME( ERRORNEW )();
 }
 
 /* There's a similar undocumented, internal functions in CA-Cl*pper named
    ErrorInHandler(). [vszakats] */
 
-HARBOUR HB___ERRINHANDLER( void )
+HB_FUNC( __ERRINHANDLER )
 {
    hb_errInternal( 9999, "Error recovery failure", NULL, NULL );
 }
 
-HARBOUR HB_ERRORBLOCK( void )
+HB_FUNC( ERRORBLOCK )
 {
    HB_ITEM oldError;
    PHB_ITEM pNewErrorBlock = hb_param( 1, IT_BLOCK );
@@ -124,7 +124,7 @@ HB_ERROR_INFO_PTR hb_errorHandler( HB_ERROR_INFO_PTR pNewHandler )
 
 /* TOFIX: Make it Clipper compatible. [vszakats] */
 
-HARBOUR HB_DOSERROR( void )
+HB_FUNC( DOSERROR )
 {
    hb_retni( s_uiErrorDOS );
 
@@ -697,7 +697,7 @@ PHB_ITEM hb_errRT_New_Subst(
    return( pError );
 }
 
-HARBOUR HB___ERRRT_BASE( void )
+HB_FUNC( __ERRRT_BASE )
 {
    hb_errRT_BASE( ( ULONG ) hb_parnl( 1 ),
                   ( ULONG ) hb_parnl( 2 ),
diff --git a/harbour/source/rtl/eval.c b/harbour/source/rtl/eval.c
index ef9483d922..5b334f0968 100644
--- a/harbour/source/rtl/eval.c
+++ b/harbour/source/rtl/eval.c
@@ -38,7 +38,7 @@
 #include "hbapierr.h"
 #include "hbvm.h"
 
-HARBOUR HB_EVAL( void )
+HB_FUNC( EVAL )
 {
    PHB_ITEM pItem = hb_param( 1, IT_BLOCK );
 
diff --git a/harbour/source/rtl/fkmax.c b/harbour/source/rtl/fkmax.c
index 718c538233..dc4dd03fa2 100644
--- a/harbour/source/rtl/fkmax.c
+++ b/harbour/source/rtl/fkmax.c
@@ -38,14 +38,14 @@
 
 /* Dumb function to maintain dBase III+ and CA-Cl*pper compatibility */
 
-HARBOUR HB_FKMAX( void )
+HB_FUNC( FKMAX )
 {
    hb_retni( 40 ); /* IBM specific */
 }
 
 /* Dumb function to maintain dBase III+ and CA-Cl*pper compatibility */
 
-HARBOUR HB_FKLABEL( void )
+HB_FUNC( FKLABEL )
 {
    PHB_ITEM pPar1 = hb_param( 1, IT_NUMERIC );
 
diff --git a/harbour/source/rtl/fnsplit.c b/harbour/source/rtl/fnsplit.c
index fb310951b2..1a955be7fb 100644
--- a/harbour/source/rtl/fnsplit.c
+++ b/harbour/source/rtl/fnsplit.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapifs.h"
 
-HARBOUR HB_HB_FNAMESPLIT( void )
+HB_FUNC( HB_FNAMESPLIT )
 {
    if( ISCHAR( 1 ) )
    {
@@ -51,7 +51,7 @@ HARBOUR HB_HB_FNAMESPLIT( void )
    }
 }
 
-HARBOUR HB_HB_FNAMEMERGE( void )
+HB_FUNC( HB_FNAMEMERGE )
 {
    HB_FNAME pFileName;
    char szFileName[ _POSIX_PATH_MAX ];
diff --git a/harbour/source/rtl/fssize.c b/harbour/source/rtl/fssize.c
index 831e04d77f..1df93cac15 100644
--- a/harbour/source/rtl/fssize.c
+++ b/harbour/source/rtl/fssize.c
@@ -80,7 +80,7 @@ ULONG hb_fsFSize( BYTE * pszFileName, BOOL bUseDirEntry )
    return 0;
 }
 
-HARBOUR HB_HB_FSIZE( void )
+HB_FUNC( HB_FSIZE )
 {
    hb_retnl( ISCHAR( 1 ) ? hb_fsFSize( ( BYTE * ) hb_parc( 1 ), 
                                        ISLOG( 2 ) ? hb_parl( 2 ) : TRUE ) : 0 );
diff --git a/harbour/source/rtl/fstemp.c b/harbour/source/rtl/fstemp.c
index 0f163ce8c5..1f99acf7ef 100644
--- a/harbour/source/rtl/fstemp.c
+++ b/harbour/source/rtl/fstemp.c
@@ -70,7 +70,7 @@ FHANDLE hb_fsCreateTemp( const BYTE * pszDir, const BYTE * pszPrefix, USHORT uiA
    return FS_ERROR;
 }
 
-HARBOUR HB_HB_FTEMPNAME()
+HB_FUNC( HB_FTEMPNAME )
 {
    BYTE szName[ _POSIX_PATH_MAX + 1 ];
 
@@ -79,7 +79,7 @@ HARBOUR HB_HB_FTEMPNAME()
    hb_retc( ( char * ) szName );
 }
 
-HARBOUR HB_HB_FTEMPCREATE( void )
+HB_FUNC( HB_FTEMPCREATE )
 {
    hb_retni( hb_fsCreateTemp( ( BYTE * ) hb_parc( 1 ),
                               ( BYTE * ) hb_parc( 2 ),
diff --git a/harbour/source/rtl/gete.c b/harbour/source/rtl/gete.c
index fa2673fb97..ed3310816a 100644
--- a/harbour/source/rtl/gete.c
+++ b/harbour/source/rtl/gete.c
@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_GETE()
+ *    GETE()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -51,7 +51,7 @@
          function will return an empty string if called with more than one
          parameter. [vszakats] */
 
-HARBOUR HB_GETENV( void )
+HB_FUNC( GETENV )
 {
    PHB_ITEM pName = hb_param( 1, IT_STRING );
 
@@ -98,8 +98,8 @@ HARBOUR HB_GETENV( void )
 
 /* NOTE: Undocumented Clipper function. [vszakats] */
 
-HARBOUR HB_GETE( void )
+HB_FUNC( GETE )
 {
-   HB_GETENV();
+   HB_FUNCNAME( GETENV )();
 }
 
diff --git a/harbour/source/rtl/gt.c b/harbour/source/rtl/gt.c
index cbb419087d..4a1577baf4 100644
--- a/harbour/source/rtl/gt.c
+++ b/harbour/source/rtl/gt.c
@@ -36,17 +36,17 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_DISPBEGIN( void )
+HB_FUNC( DISPBEGIN )
 {
    hb_gtDispBegin();
 }
 
-HARBOUR HB_DISPEND( void )
+HB_FUNC( DISPEND )
 {
    hb_gtDispEnd();
 }
 
-HARBOUR HB_DISPCOUNT( void )
+HB_FUNC( DISPCOUNT )
 {
    hb_retni( hb_gtDispCount() );
 }
diff --git a/harbour/source/rtl/gx.c b/harbour/source/rtl/gx.c
index 12f8c2511e..05708a796d 100644
--- a/harbour/source/rtl/gx.c
+++ b/harbour/source/rtl/gx.c
@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 {list of individual authors and e-mail addresses}
- *    HB_SETMODE()
+ *    SETMODE()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -47,18 +47,18 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_ISCOLOR( void )
+HB_FUNC( ISCOLOR )
 {
    hb_retl( hb_gtIsColor() );
 }
 
-HARBOUR HB_NOSNOW( void )
+HB_FUNC( NOSNOW )
 {
    if( ISLOG( 1 ) )
       hb_gtSetSnowFlag( hb_parl( 1 ) );
 }
 
-HARBOUR HB_SETMODE( void )
+HB_FUNC( SETMODE )
 {
    hb_retl( hb_gtSetMode( ISNUM( 1 ) ? hb_parni( 1 ) : ( hb_gtMaxRow() + 1 ),
                           ISNUM( 2 ) ? hb_parni( 2 ) : ( hb_gtMaxCol() + 1 ) ) == 0 );
diff --git a/harbour/source/rtl/hardcr.c b/harbour/source/rtl/hardcr.c
index 1114acd1fe..e1ceb06c7b 100644
--- a/harbour/source/rtl/hardcr.c
+++ b/harbour/source/rtl/hardcr.c
@@ -59,7 +59,7 @@ char * hb_strHardCR( char * pszString, ULONG ulStringLen )
    return pszString;
 }
 
-HARBOUR HB_HARDCR( void )
+HB_FUNC( HARDCR )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/inkey.c b/harbour/source/rtl/inkey.c
index 3c7c956dbd..933f7d134c 100644
--- a/harbour/source/rtl/inkey.c
+++ b/harbour/source/rtl/inkey.c
@@ -72,7 +72,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_HB_KEYPUT()
+ *    HB_KEYPUT()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -321,7 +321,7 @@ void hb_inkeyReset( BOOL allocate )     /* Reset the keyboard buffer */
    }
 }
 
-HARBOUR HB_INKEY( void )
+HB_FUNC( INKEY )
 {
    int args = hb_pcount();
    int key = 0;
@@ -357,7 +357,7 @@ HARBOUR HB_INKEY( void )
    hb_retni( key );
 }
 
-HARBOUR HB___KEYBOARD( void )
+HB_FUNC( __KEYBOARD )
 {
    /* Clear the typeahead buffer without reallocating the keyboard buffer */
    hb_inkeyReset( FALSE );
@@ -410,18 +410,18 @@ void hb_inkeyPut( int ch )
    }
 }
 
-HARBOUR HB_HB_KEYPUT( void )
+HB_FUNC( HB_KEYPUT )
 {
    if( ISNUM( 1 ) )
       hb_inkeyPut( hb_parni( 1 ) );
 }
 
-HARBOUR HB_NEXTKEY( void )
+HB_FUNC( NEXTKEY )
 {
    hb_retni( hb_inkeyNext() );
 }
 
-HARBOUR HB_LASTKEY( void )
+HB_FUNC( LASTKEY )
 {
    hb_retni( s_inkeyLast );
 }
diff --git a/harbour/source/rtl/is.c b/harbour/source/rtl/is.c
index 946011ae3c..a573702117 100644
--- a/harbour/source/rtl/is.c
+++ b/harbour/source/rtl/is.c
@@ -41,7 +41,7 @@
 /* TEST: QOUT( "isalpha( 'hello' ) = ", isalpha( 'hello' ) ) */
 /* TEST: QOUT( "isalpha( '12345' ) = ", isalpha( '12345' ) ) */
 
-HARBOUR HB_ISALPHA( void )
+HB_FUNC( ISALPHA )
 {
    hb_retl( isalpha( *hb_parc( 1 ) ) );
 }
@@ -50,7 +50,7 @@ HARBOUR HB_ISALPHA( void )
 /* TEST: QOUT( "isdigit( '12345' ) = ", isdigit( '12345' ) ) */
 /* TEST: QOUT( "isdigit( 'abcde' ) = ", isdigit( 'abcde' ) ) */
 
-HARBOUR HB_ISDIGIT( void )
+HB_FUNC( ISDIGIT )
 {
    hb_retl( isdigit( *hb_parc( 1 ) ) );
 }
@@ -59,7 +59,7 @@ HARBOUR HB_ISDIGIT( void )
 /* TEST: QOUT( "isupper( 'Abcde' ) = ", isupper( 'Abcde' ) ) */
 /* TEST: QOUT( "isupper( 'abcde' ) = ", isupper( 'abcde' ) ) */
 
-HARBOUR HB_ISUPPER( void )
+HB_FUNC( ISUPPER )
 {
    hb_retl( isupper( *hb_parc( 1 ) ) );
 }
@@ -68,7 +68,7 @@ HARBOUR HB_ISUPPER( void )
 /* TEST: QOUT( "islower( 'abcde' ) = ", islower( 'abcde' ) ) */
 /* TEST: QOUT( "islower( 'Abcde' ) = ", islower( 'Abcde' ) ) */
 
-HARBOUR HB_ISLOWER( void )
+HB_FUNC( ISLOWER )
 {
    hb_retl( islower( *hb_parc( 1 ) ) );
 }
diff --git a/harbour/source/rtl/isprint.c b/harbour/source/rtl/isprint.c
index 354c3c182c..c2ba2221a2 100644
--- a/harbour/source/rtl/isprint.c
+++ b/harbour/source/rtl/isprint.c
@@ -66,7 +66,7 @@
 /* NOTE: The parameter is an extension over CA-Cl*pper, it's also supported
          by XBase++. [vszakats] */
 
-HARBOUR HB_ISPRINTER( void )
+HB_FUNC( ISPRINTER )
 {
    char * pszDOSPort = ( ISCHAR( 1 ) && hb_parclen( 1 ) >= 4 ) ? hb_parc( 1 ) : "LPT1";
    USHORT uiPort = atoi( pszDOSPort + 3 );
diff --git a/harbour/source/rtl/left.c b/harbour/source/rtl/left.c
index 8526765c6a..f142e7bc58 100644
--- a/harbour/source/rtl/left.c
+++ b/harbour/source/rtl/left.c
@@ -39,7 +39,7 @@
 
 /* returns the left-most n characters in string */
 
-HARBOUR HB_LEFT( void )
+HB_FUNC( LEFT )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/len.c b/harbour/source/rtl/len.c
index 6f2636c291..2c847f6c54 100644
--- a/harbour/source/rtl/len.c
+++ b/harbour/source/rtl/len.c
@@ -37,7 +37,7 @@
 #include "hbapierr.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_LEN( void )
+HB_FUNC( LEN )
 {
    PHB_ITEM pItem = hb_param( 1, IT_ANY );
 
diff --git a/harbour/source/rtl/lennum.c b/harbour/source/rtl/lennum.c
index 62e3c631e3..c59bb50c24 100644
--- a/harbour/source/rtl/lennum.c
+++ b/harbour/source/rtl/lennum.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_LENNUM( void )
+HB_FUNC( LENNUM )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
    ULONG ulLen = 0;
diff --git a/harbour/source/rtl/math.c b/harbour/source/rtl/math.c
index 2e1212d7dd..3945223b8f 100644
--- a/harbour/source/rtl/math.c
+++ b/harbour/source/rtl/math.c
@@ -97,7 +97,7 @@ int matherr( struct exception * err )
 }
 #endif
 
-HARBOUR HB_EXP( void )
+HB_FUNC( EXP )
 {
    if( ISNUM( 1 ) )
    {
@@ -134,7 +134,7 @@ HARBOUR HB_EXP( void )
    }
 }
 
-HARBOUR HB_LOG( void )
+HB_FUNC( LOG )
 {
    if( ISNUM( 1 ) )
    {
@@ -177,7 +177,7 @@ HARBOUR HB_LOG( void )
    }
 }
 
-HARBOUR HB_SQRT( void )
+HB_FUNC( SQRT )
 {
    if( ISNUM( 1 ) )
    {
diff --git a/harbour/source/rtl/maxrow.c b/harbour/source/rtl/maxrow.c
index 6390f9f76d..79ea779130 100644
--- a/harbour/source/rtl/maxrow.c
+++ b/harbour/source/rtl/maxrow.c
@@ -36,12 +36,12 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_MAXROW( void ) /* Return the maximum screen row number (zero origin) */
+HB_FUNC( MAXROW ) /* Return the maximum screen row number (zero origin) */
 {
    hb_retni( hb_gtMaxRow() );
 }
 
-HARBOUR HB_MAXCOL( void ) /* Return the maximum screen column number (zero origin) */
+HB_FUNC( MAXCOL ) /* Return the maximum screen column number (zero origin) */
 {
    hb_retni( hb_gtMaxCol() );
 }
diff --git a/harbour/source/rtl/memofile.c b/harbour/source/rtl/memofile.c
index 9c91270cab..01e040d0a7 100644
--- a/harbour/source/rtl/memofile.c
+++ b/harbour/source/rtl/memofile.c
@@ -41,7 +41,7 @@
          this limit is extended, so we are not *stricly* compatible here. 
          [vszakats] */
 
-HARBOUR HB_MEMOREAD( void )
+HB_FUNC( MEMOREAD )
 {
    PHB_ITEM pFileName = hb_param( 1, IT_STRING );
 
@@ -83,7 +83,7 @@ HARBOUR HB_MEMOREAD( void )
       hb_retc( "" );
 }
 
-HARBOUR HB_MEMOWRIT( void )
+HB_FUNC( MEMOWRIT )
 {
    PHB_ITEM pFileName = hb_param( 1, IT_STRING );
    PHB_ITEM pString = hb_param( 2, IT_STRING );
diff --git a/harbour/source/rtl/memoline.c b/harbour/source/rtl/memoline.c
index cde1771122..d8c0a9618b 100644
--- a/harbour/source/rtl/memoline.c
+++ b/harbour/source/rtl/memoline.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_MEMOLINE( void )
+HB_FUNC( MEMOLINE )
 {
    char * pszString    = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
    ULONG  ulLineLength = ISNUM( 2 ) ? hb_parni( 2 ) : 79;
diff --git a/harbour/source/rtl/minmax.c b/harbour/source/rtl/minmax.c
index bf32b7cbbb..2c653a034b 100644
--- a/harbour/source/rtl/minmax.c
+++ b/harbour/source/rtl/minmax.c
@@ -38,7 +38,7 @@
 #include "hbapierr.h"
 
 /* returns the maximum of two date or numerics */
-HARBOUR HB_MAX( void )
+HB_FUNC( MAX )
 {
    PHB_ITEM p1 = hb_param( 1, IT_ANY );
    PHB_ITEM p2 = hb_param( 2, IT_ANY );
@@ -98,7 +98,7 @@ HARBOUR HB_MAX( void )
 }
 
 /* returns the minimum of two date or numerics */
-HARBOUR HB_MIN( void )
+HB_FUNC( MIN )
 {
    PHB_ITEM p1 = hb_param( 1, IT_ANY );
    PHB_ITEM p2 = hb_param( 2, IT_ANY );
diff --git a/harbour/source/rtl/mlcount.c b/harbour/source/rtl/mlcount.c
index 413dd2d95a..55e136e320 100644
--- a/harbour/source/rtl/mlcount.c
+++ b/harbour/source/rtl/mlcount.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_MLCOUNT( void )
+HB_FUNC( MLCOUNT )
 {
    char * pszString    = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
    ULONG  ulLineLength = ISNUM( 2 ) ? hb_parni( 2 ) : 79;
diff --git a/harbour/source/rtl/mlpos.c b/harbour/source/rtl/mlpos.c
index 19a341d33e..58d33c1013 100644
--- a/harbour/source/rtl/mlpos.c
+++ b/harbour/source/rtl/mlpos.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_MLPOS( void )
+HB_FUNC( MLPOS )
 {
    char * pszString    = ISCHAR( 1 ) ? hb_parc( 1 ) : "";
    ULONG  ulLineLength = hb_parni( 2 );
diff --git a/harbour/source/rtl/mod.c b/harbour/source/rtl/mod.c
index d6d2615ea3..6d59e72973 100644
--- a/harbour/source/rtl/mod.c
+++ b/harbour/source/rtl/mod.c
@@ -47,7 +47,7 @@
 /* NOTE: This C version fully emulates the behaviour of the original
          CA-Cl*pper version, including bugs/side-effects. [vszakats] */
 
-HARBOUR HB_MOD( void )
+HB_FUNC( MOD )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
 
diff --git a/harbour/source/rtl/mouseapi.c b/harbour/source/rtl/mouseapi.c
index 69ffdd90b0..b6c06d414f 100644
--- a/harbour/source/rtl/mouseapi.c
+++ b/harbour/source/rtl/mouseapi.c
@@ -161,22 +161,22 @@ void hb_mouseGetBounds( int * piTop, int * piLeft, int * piBottom, int * piRight
 
 #ifdef HB_COMPAT_C53
 
-HARBOUR HB_MPRESENT( void )
+HB_FUNC( MPRESENT )
 {
    hb_retl( hb_mouseIsPresent() );
 }
 
-HARBOUR HB_MHIDE( void )
+HB_FUNC( MHIDE )
 {
    hb_mouseSetCursor( FALSE );
 }
 
-HARBOUR HB_MSHOW( void )
+HB_FUNC( MSHOW )
 {
    hb_mouseSetCursor( TRUE );
 }
 
-HARBOUR HB_MSETCURSOR( void )
+HB_FUNC( MSETCURSOR )
 {
    hb_retl( hb_mouseGetCursor() );
 
@@ -184,33 +184,33 @@ HARBOUR HB_MSETCURSOR( void )
       hb_mouseSetCursor( hb_parl( 1 ) );
 }
 
-HARBOUR HB_MROW( void )
+HB_FUNC( MROW )
 {
    hb_retni( hb_mouseRow() );   
 }
 
-HARBOUR HB_MCOL( void )
+HB_FUNC( MCOL )
 {
    hb_retni( hb_mouseCol() );   
 }
 
-HARBOUR HB_MSETPOS( void )
+HB_FUNC( MSETPOS )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_mouseSetPos( hb_parni( 1 ), hb_parni( 2 ) );
 }
 
-HARBOUR HB_MRIGHTDOWN( void )
+HB_FUNC( MRIGHTDOWN )
 {
    hb_retl( hb_mouseIsButtonPressed( s_iRightButton ) );
 }
 
-HARBOUR HB_MLEFTDOWN( void )
+HB_FUNC( MLEFTDOWN )
 {
    hb_retl( hb_mouseIsButtonPressed( s_iLeftButton ) );
 }
 
-HARBOUR HB_MDBLCLK( void )
+HB_FUNC( MDBLCLK )
 {
    hb_retni( s_uiDoubleClickSpeed );
 
@@ -223,7 +223,7 @@ HARBOUR HB_MDBLCLK( void )
    }
 }
 
-HARBOUR HB_MSAVESTATE( void )
+HB_FUNC( MSAVESTATE )
 {
    int iTop, iLeft, iBottom, iRight;
 
@@ -260,7 +260,7 @@ HARBOUR HB_MSAVESTATE( void )
    hb_xfree( pBuffer );
 }
 
-HARBOUR HB_MRESTSTATE( void )
+HB_FUNC( MRESTSTATE )
 {
    USHORT uiLen = sizeof( int ) + 
                   sizeof( int ) + 
@@ -301,7 +301,7 @@ HARBOUR HB_MRESTSTATE( void )
    }
 }
 
-HARBOUR HB_MSETBOUNDS( void )
+HB_FUNC( MSETBOUNDS )
 {
    int iTop    = ISNUM( 1 ) ? hb_parni( 1 ) : 0;
    int iLeft   = ISNUM( 2 ) ? hb_parni( 2 ) : 0; 
@@ -313,34 +313,3 @@ HARBOUR HB_MSETBOUNDS( void )
 
 #endif
 
-#ifdef HB_COMPAT_XPP
-
-/* NOTE: XBase++ compatible function */
-
-HARBOUR HB_NUMBUTTONS( void )
-{
-   hb_retni( hb_mouseCountButton() );
-}
-
-/* NOTE: XBase++ compatible function */
-
-HARBOUR HB_SETMOUSE( void )
-{
-   hb_retl( hb_mouseGetCursor() );
-
-   if( ISLOG( 1 ) )
-      hb_mouseSetCursor( hb_parl( 1 ) );
-
-   {
-      PHB_ITEM pRow = hb_param( 2, IT_NUMERIC );
-      PHB_ITEM pCol = hb_param( 3, IT_NUMERIC );
-
-      if( pRow || pCol )
-      {
-         hb_mouseSetPos( pRow ? hb_itemGetNI( pRow ) : hb_mouseRow() ,
-                         pCol ? hb_itemGetNI( pCol ) : hb_mouseCol() );
-      }
-   }
-}
-
-#endif
diff --git a/harbour/source/rtl/mousex.c b/harbour/source/rtl/mousex.c
new file mode 100644
index 0000000000..e3cd36377c
--- /dev/null
+++ b/harbour/source/rtl/mousex.c
@@ -0,0 +1,68 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * NUMBUTTONS(), SETMOUSE() XBase++ compatible functions.
+ *
+ * Copyright 1999 Victor Szakats <info@szelvesz.hu>
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version, with one exception:
+ *
+ * The exception is that if you link the Harbour Runtime Library (HRL)
+ * and/or the Harbour Virtual Machine (HVM) with other files to produce
+ * an executable, this does not by itself cause the resulting executable
+ * to be covered by the GNU General Public License. Your use of that
+ * executable is in no way restricted on account of linking the HRL
+ * and/or HVM code into it.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
+ * their web site at http://www.gnu.org/).
+ *
+ */
+
+#include "hbapi.h"
+#include "hbapiitm.h"
+#include "hbapigt.h"
+
+/* NOTE: XBase++ compatible functions */
+
+#ifdef HB_COMPAT_XPP
+
+HB_FUNC( NUMBUTTONS )
+{
+   hb_retni( hb_mouseCountButton() );
+}
+
+HB_FUNC( SETMOUSE )
+{
+   hb_retl( hb_mouseGetCursor() );
+
+   if( ISLOG( 1 ) )
+      hb_mouseSetCursor( hb_parl( 1 ) );
+
+   {
+      PHB_ITEM pRow = hb_param( 2, IT_NUMERIC );
+      PHB_ITEM pCol = hb_param( 3, IT_NUMERIC );
+
+      if( pRow || pCol )
+      {
+         hb_mouseSetPos( pRow ? hb_itemGetNI( pRow ) : hb_mouseRow() ,
+                         pCol ? hb_itemGetNI( pCol ) : hb_mouseCol() );
+      }
+   }
+}
+
+#endif
diff --git a/harbour/source/rtl/mtran.c b/harbour/source/rtl/mtran.c
index f60d2c1f82..eaa5929fcd 100644
--- a/harbour/source/rtl/mtran.c
+++ b/harbour/source/rtl/mtran.c
@@ -77,7 +77,7 @@ char * hb_strMemotran( char * pszResult, ULONG * ulResultLen, const char * pszSt
    return pszResult;
 }
 
-HARBOUR HB_MEMOTRAN( void )
+HB_FUNC( MEMOTRAN )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/natmsg.c b/harbour/source/rtl/natmsg.c
index fa99a9a7a3..c497e9e737 100644
--- a/harbour/source/rtl/natmsg.c
+++ b/harbour/source/rtl/natmsg.c
@@ -38,8 +38,8 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB__NATSORTVER()
- *    HB__NATMSGVER()
+ *    _NATSORTVER()
+ *    _NATMSGVER()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -93,21 +93,21 @@ char * hb_nationGetMsg( USHORT uiMsg )
    return ( uiMsg >= 1 && uiMsg <= ( sizeof( s_szMessages ) / sizeof( char * ) ) ) ? s_szMessages[ uiMsg - 1 ] : "";
 }
 
-HARBOUR HB_ISAFFIRM( void )
+HB_FUNC( ISAFFIRM )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
    hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && toupper( hb_itemGetCPtr( pItem )[ 0 ] ) == s_szMessages[ _LF_YN - 1 ][ 0 ] );
 }
 
-HARBOUR HB_ISNEGATIVE( void )
+HB_FUNC( ISNEGATIVE )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
    hb_retl( pItem && hb_itemGetCLen( pItem ) >= 1 && toupper( hb_itemGetCPtr( pItem )[ 0 ] ) == s_szMessages[ _LF_YN - 1 ][ 2 ] );
 }
 
-HARBOUR HB_NATIONMSG( void )
+HB_FUNC( NATIONMSG )
 {
    if( hb_pcount() == 0 )
       /* TODO: Replace this with Language API call. */
@@ -121,7 +121,7 @@ HARBOUR HB_NATIONMSG( void )
 /* NOTE: Intentionally using one leading underscore, like in Clipper. 
          [vszakats] */
 
-HARBOUR HB__NATSORTVER( void )
+HB_FUNC( _NATSORTVER )
 {
    /* NOTE: CA-Cl*pper 5.2e Intl. will return: "NATSORT v1.2i x14 19/Mar/93" */
    /* NOTE: CA-Cl*pper 5.3  Intl. will return: "NATSORT v1.3i x19 06/Mar/95" */
@@ -132,7 +132,7 @@ HARBOUR HB__NATSORTVER( void )
 /* NOTE: Intentionally using one leading underscore, like in Clipper. 
          [vszakats] */
 
-HARBOUR HB__NATMSGVER( void )
+HB_FUNC( _NATMSGVER )
 {
    /* NOTE: CA-Cl*pper 5.2e Intl. will return: "NATMSGS v1.2i x14 19/Mar/93" */
    /* NOTE: CA-Cl*pper 5.3  Intl. will return: "NATMSGS v1.3i x19 06/Mar/95" */
diff --git a/harbour/source/rtl/net.c b/harbour/source/rtl/net.c
index 451b188523..18a85bceea 100644
--- a/harbour/source/rtl/net.c
+++ b/harbour/source/rtl/net.c
@@ -55,7 +55,7 @@
                       AX         Error code, if CF is set
 */
 
-HARBOUR HB_NETNAME( void )
+HB_FUNC( NETNAME )
 {
 #if defined(HB_OS_WIN_32)
    {
diff --git a/harbour/source/rtl/oemansi.c b/harbour/source/rtl/oemansi.c
index edb333c8a5..a5e0d4c9c8 100644
--- a/harbour/source/rtl/oemansi.c
+++ b/harbour/source/rtl/oemansi.c
@@ -41,7 +41,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_HB_ANSITOOEM( void )
+HB_FUNC( HB_ANSITOOEM )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 
@@ -63,7 +63,7 @@ HARBOUR HB_HB_ANSITOOEM( void )
       hb_retc( "" );
 }
            
-HARBOUR HB_HB_OEMTOANSI( void )
+HB_FUNC( HB_OEMTOANSI )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
 
@@ -89,16 +89,16 @@ HARBOUR HB_HB_OEMTOANSI( void )
 
 /* NOTE: XBase++ compatible function */
 
-HARBOUR HB_CONVTOOEMCP( void )
+HB_FUNC( CONVTOOEMCP )
 {
-   HB_HB_ANSITOOEM();
+   HB_FUNCNAME( HB_ANSITOOEM )();
 }
 
 /* NOTE: XBase++ compatible function */
 
-HARBOUR HB_CONVTOANSICP( void )
+HB_FUNC( CONVTOANSICP )
 {
-   HB_HB_OEMTOANSI();
+   HB_FUNCNAME( HB_OEMTOANSI )();
 }
 
 #endif
diff --git a/harbour/source/rtl/oldbox.c b/harbour/source/rtl/oldbox.c
index 49c9e46988..b0e3b0bdef 100644
--- a/harbour/source/rtl/oldbox.c
+++ b/harbour/source/rtl/oldbox.c
@@ -35,20 +35,20 @@
 
 #include "hbapigt.h"
 
-HARBOUR HB___BOX( void )
+HB_FUNC( __BOX )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
       hb_gtBox( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ),
                 ( BYTE * ) ( ISCHAR( 5 ) ? hb_parc( 5 ) : " " ) );
 }
 
-HARBOUR HB___BOXD( void )
+HB_FUNC( __BOXD )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
       hb_gtBoxD( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) );
 }
 
-HARBOUR HB___BOXS( void )
+HB_FUNC( __BOXS )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISNUM( 4 ) )
       hb_gtBoxS( hb_parni( 1 ), hb_parni( 2 ), hb_parni( 3 ), hb_parni( 4 ) );
diff --git a/harbour/source/rtl/oldclear.c b/harbour/source/rtl/oldclear.c
index 2f89a366dc..c5c0eecc32 100644
--- a/harbour/source/rtl/oldclear.c
+++ b/harbour/source/rtl/oldclear.c
@@ -35,7 +35,7 @@
 
 #include "hbapigt.h"
 
-HARBOUR HB___ATCLEAR( void )
+HB_FUNC( __ATCLEAR )
 {
    if( hb_pcount() == 4 )
    {
@@ -44,7 +44,7 @@ HARBOUR HB___ATCLEAR( void )
    }
 }
 
-HARBOUR HB___CLEAR( void )
+HB_FUNC( __CLEAR )
 {
    hb_gtScroll( 0, 0, hb_gtMaxRow(), hb_gtMaxCol(), 0, 0 );
    hb_gtSetPos( 0, 0 );
diff --git a/harbour/source/rtl/pad.c b/harbour/source/rtl/pad.c
index 0b18d91ce0..f5d333f088 100644
--- a/harbour/source/rtl/pad.c
+++ b/harbour/source/rtl/pad.c
@@ -95,7 +95,7 @@ static char * hb_itemPadConv( PHB_ITEM pItem, char * buffer, ULONG * pulSize )
 
 /* right-pads a date, number, or string with spaces or supplied character */
 /* TEST: QOUT( "padr( 'hello', 10 ) = '" + padr( 'hello', 10 ) + "'" ) */
-HARBOUR HB_PADR( void )
+HB_FUNC( PADR )
 {
    ULONG ulSize;
    char buffer[ 128 ];
@@ -134,14 +134,14 @@ HARBOUR HB_PADR( void )
 }
 
 /* synonymn for PADR */
-HARBOUR HB_PAD( void )
+HB_FUNC( PAD )
 {
-   HB_PADR();
+   HB_FUNCNAME( PADR )();
 }
 
 /* left-pads a date, number, or string with spaces or supplied character */
 /* TEST: QOUT( "padl( 'hello', 10 ) = '" + padl( 'hello', 10 ) + "'" ) */
-HARBOUR HB_PADL( void )
+HB_FUNC( PADL )
 {
    ULONG ulSize;
    char buffer[ 128 ];
@@ -183,7 +183,7 @@ HARBOUR HB_PADL( void )
 
 /* centre-pads a date, number, or string with spaces or supplied character */
 /* TEST: QOUT( "padc( 'hello', 10 ) = '" + padc( 'hello', 10 ) + "'" ) */
-HARBOUR HB_PADC( void )
+HB_FUNC( PADC )
 {
    ULONG ulSize;
    char buffer[ 128 ];
@@ -225,3 +225,4 @@ HARBOUR HB_PADC( void )
    else
       hb_retc( "" );
 }
+
diff --git a/harbour/source/rtl/philes.c b/harbour/source/rtl/philes.c
index cb4914b60b..cacd4138cc 100644
--- a/harbour/source/rtl/philes.c
+++ b/harbour/source/rtl/philes.c
@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB_CURDIR()
+ *    CURDIR()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -50,7 +50,7 @@
 #include "hbapifs.h"
 #include "hbapierr.h"
 
-HARBOUR HB_FOPEN( void )
+HB_FUNC( FOPEN )
 {
    if( ISCHAR( 1 ) )
       hb_retni( hb_fsOpen( ( BYTE * ) hb_parc( 1 ),
@@ -59,7 +59,7 @@ HARBOUR HB_FOPEN( void )
       hb_errRT_BASE( EG_ARG, 2021, NULL, "FOPEN" ); /* NOTE: Undocumented but existing Clipper Run-time error */
 }
 
-HARBOUR HB_FCREATE( void )
+HB_FUNC( FCREATE )
 {
    if( ISCHAR( 1 ) )
       hb_retni( hb_fsCreate( ( BYTE * ) hb_parc( 1 ),
@@ -68,7 +68,7 @@ HARBOUR HB_FCREATE( void )
       hb_retni( FS_ERROR );
 }
 
-HARBOUR HB_FREAD( void )
+HB_FUNC( FREAD )
 {
    ULONG ulRead;
 
@@ -96,7 +96,7 @@ HARBOUR HB_FREAD( void )
    hb_retnl( ulRead );
 }
 
-HARBOUR HB_FWRITE( void )
+HB_FUNC( FWRITE )
 {
    if( ISNUM( 1 ) && ISCHAR( 2 ) )
       hb_retnl( hb_fsWriteLarge( hb_parni( 1 ),
@@ -106,12 +106,12 @@ HARBOUR HB_FWRITE( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_FERROR( void )
+HB_FUNC( FERROR )
 {
    hb_retni( hb_fsError() );
 }
 
-HARBOUR HB_FCLOSE( void )
+HB_FUNC( FCLOSE )
 {
    hb_fsSetError( 0 );
 
@@ -124,7 +124,7 @@ HARBOUR HB_FCLOSE( void )
       hb_retl( FALSE );
 }
 
-HARBOUR HB_FERASE( void )
+HB_FUNC( FERASE )
 {
    hb_fsSetError( 3 );
 
@@ -134,7 +134,7 @@ HARBOUR HB_FERASE( void )
       hb_retni( -1 );
 }
 
-HARBOUR HB_FRENAME( void )
+HB_FUNC( FRENAME )
 {
    hb_fsSetError( 2 );
 
@@ -144,7 +144,7 @@ HARBOUR HB_FRENAME( void )
       hb_retni( -1 );
 }
 
-HARBOUR HB_FSEEK( void )
+HB_FUNC( FSEEK )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_retnl( hb_fsSeek( hb_parni( 1 ),
@@ -154,12 +154,12 @@ HARBOUR HB_FSEEK( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_FILE( void )
+HB_FUNC( FILE )
 {
    hb_retl( ISCHAR( 1 ) ? hb_fsFile( ( BYTE * ) hb_parc( 1 ) ) : FALSE );
 }
 
-HARBOUR HB_FREADSTR( void )
+HB_FUNC( FREADSTR )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
    {
@@ -190,7 +190,7 @@ HARBOUR HB_FREADSTR( void )
 /* NOTE: This function should not return the leading and trailing */
 /*       (back)slashes. [vszakats] */
 
-HARBOUR HB_CURDIR( void )
+HB_FUNC( CURDIR )
 {
    USHORT uiErrorOld = hb_fsError();
    BYTE * pbyBuffer = ( BYTE * ) hb_xgrab( _POSIX_PATH_MAX + 1 );
diff --git a/harbour/source/rtl/philes53.c b/harbour/source/rtl/philes53.c
index 77afff846a..62cddf0531 100644
--- a/harbour/source/rtl/philes53.c
+++ b/harbour/source/rtl/philes53.c
@@ -40,7 +40,7 @@
 
 /* NOTE: Clipper 5.3 undocumented */
 
-HARBOUR HB_FSETDEVMOD( void )
+HB_FUNC( FSETDEVMOD )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_fsSetDevMode( hb_parni( 1 ), hb_parni( 2 ) );
diff --git a/harbour/source/rtl/philesx.c b/harbour/source/rtl/philesx.c
index d49917f8f0..f294f6b5da 100644
--- a/harbour/source/rtl/philesx.c
+++ b/harbour/source/rtl/philesx.c
@@ -42,7 +42,7 @@
 
 /* NOTE: XBase++ compatible */
 
-HARBOUR HB_CURDRIVE( void )
+HB_FUNC( CURDRIVE )
 {
    USHORT uiErrorOld = hb_fsError();
    char szDrive[ 1 ];
diff --git a/harbour/source/rtl/rat.c b/harbour/source/rtl/rat.c
index 18462cd9be..2dde8bb97c 100644
--- a/harbour/source/rtl/rat.c
+++ b/harbour/source/rtl/rat.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_RAT( void )
+HB_FUNC( RAT )
 {
    ULONG ulSubLen = hb_parclen( 1 );
 
diff --git a/harbour/source/rtl/replic.c b/harbour/source/rtl/replic.c
index 32475928f8..4cb2549bcb 100644
--- a/harbour/source/rtl/replic.c
+++ b/harbour/source/rtl/replic.c
@@ -39,7 +39,7 @@
 
 /* returns n copies of given string */
 /* TEST: QOUT( "replicate( 'abc', 5 ) = " + replicate( 'abc', 5 ) ) */
-HARBOUR HB_REPLICATE( void )
+HB_FUNC( REPLICATE )
 {
    if( ISCHAR( 1 ) && ISNUM( 2 ) )
    {
diff --git a/harbour/source/rtl/right.c b/harbour/source/rtl/right.c
index cb243845cd..3ed3e430c2 100644
--- a/harbour/source/rtl/right.c
+++ b/harbour/source/rtl/right.c
@@ -39,7 +39,7 @@
 
 /* returns the right-most n characters in string */
 
-HARBOUR HB_RIGHT( void )
+HB_FUNC( RIGHT )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/round.c b/harbour/source/rtl/round.c
index a34559091e..3480ef6caa 100644
--- a/harbour/source/rtl/round.c
+++ b/harbour/source/rtl/round.c
@@ -38,7 +38,7 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 David G. Holm <dholm@jsd-llc.com>
- *    HB_ROUND()
+ *    ROUND()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -50,7 +50,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_INT( void )
+HB_FUNC( INT )
 {
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
 
@@ -115,7 +115,7 @@ double hb_numRound( double dResult, int iDec )
    return dResult;
 }
 
-HARBOUR HB_ROUND( void )
+HB_FUNC( ROUND )
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
    {
diff --git a/harbour/source/rtl/run.c b/harbour/source/rtl/run.c
index 962ad8ca5a..12e7d3507c 100644
--- a/harbour/source/rtl/run.c
+++ b/harbour/source/rtl/run.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapierr.h"
 
-HARBOUR HB___RUN( void )
+HB_FUNC( __RUN )
 {
 #if defined(__TURBOC__) || defined(__BORLANDC__)  || defined(_MSC_VER) || defined(__IBMCPP__) || defined(__GNUC__)
    if( ISCHAR( 1 ) )
diff --git a/harbour/source/rtl/samples.c b/harbour/source/rtl/samples.c
index 89cc56beb9..dd3008db5e 100644
--- a/harbour/source/rtl/samples.c
+++ b/harbour/source/rtl/samples.c
@@ -80,12 +80,12 @@ static ULONG hb_TimeStrToSec( char * pszTime )
    return ulTime;
 }
 
-HARBOUR HB_DAYS( void )
+HB_FUNC( DAYS )
 {
    hb_retnl( hb_parnl( 1 ) / 86400 );
 }
 
-HARBOUR HB_ELAPTIME( void )
+HB_FUNC( ELAPTIME )
 {
    ULONG ulStart = hb_TimeStrToSec( hb_parc( 1 ) );
    ULONG ulEnd = hb_TimeStrToSec( hb_parc( 2 ) );
@@ -94,12 +94,12 @@ HARBOUR HB_ELAPTIME( void )
    hb_retc( hb_SecToTimeStr( szTime, ( ulEnd < ulStart ? 86400 : 0 ) + ulEnd - ulStart ) );
 }
 
-HARBOUR HB_SECS( void )
+HB_FUNC( SECS )
 {
    hb_retnl( hb_TimeStrToSec( hb_parc( 1 ) ) );
 }
 
-HARBOUR HB_TSTRING( void )
+HB_FUNC( TSTRING )
 {
    char szTime[ 9 ];
 
diff --git a/harbour/source/rtl/saverest.c b/harbour/source/rtl/saverest.c
index df18da4653..bf87a75e03 100644
--- a/harbour/source/rtl/saverest.c
+++ b/harbour/source/rtl/saverest.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_SAVESCREEN( void )
+HB_FUNC( SAVESCREEN )
 {
    USHORT uiTop    = ISNUM( 1 ) ? hb_parni( 1 ) : 0;      
    USHORT uiLeft   = ISNUM( 2 ) ? hb_parni( 2 ) : 0;      
@@ -55,7 +55,7 @@ HARBOUR HB_SAVESCREEN( void )
    hb_xfree( ( char * ) pBuffer );
 }
 
-HARBOUR HB_RESTSCREEN( void )
+HB_FUNC( RESTSCREEN )
 {
    if( ISCHAR( 5 ) )
       hb_gtRest( ISNUM( 1 ) ? hb_parni( 1 ) : 0,            
diff --git a/harbour/source/rtl/scroll.c b/harbour/source/rtl/scroll.c
index 33d34c2a9a..7c8f46f1fd 100644
--- a/harbour/source/rtl/scroll.c
+++ b/harbour/source/rtl/scroll.c
@@ -38,7 +38,7 @@
 
 /* Scrolls a screen region */
 
-HARBOUR HB_SCROLL( void )
+HB_FUNC( SCROLL )
 {
    int iMaxRow = hb_gtMaxRow();
    int iMaxCol = hb_gtMaxCol();
diff --git a/harbour/source/rtl/seconds.c b/harbour/source/rtl/seconds.c
index 935f062901..a74001cd8d 100644
--- a/harbour/source/rtl/seconds.c
+++ b/harbour/source/rtl/seconds.c
@@ -62,7 +62,7 @@ double hb_secondsToday( void )
           ( ( double ) tb.millitm / 1000 );
 }
 
-HARBOUR HB_SECONDS( void )
+HB_FUNC( SECONDS )
 {
    hb_retnd( hb_secondsToday() );
 }
diff --git a/harbour/source/rtl/set.c b/harbour/source/rtl/set.c
index 29d011952a..288a5a5155 100644
--- a/harbour/source/rtl/set.c
+++ b/harbour/source/rtl/set.c
@@ -373,7 +373,7 @@ static FHANDLE open_handle( char * file_name, BOOL bAppend, char * def_ext, HB_s
    return handle;
 }
 
-HARBOUR HB_SETCANCEL( void )
+HB_FUNC( SETCANCEL )
 {
    hb_retl( hb_set.HB_SET_CANCEL );
 
@@ -381,7 +381,7 @@ HARBOUR HB_SETCANCEL( void )
       hb_set.HB_SET_CANCEL = hb_parl( 1 );
 }
 
-HARBOUR HB___SETCENTURY( void )
+HB_FUNC( __SETCENTURY )
 {
    BOOL old_century_setting = hb_set.hb_set_century;
 
@@ -463,7 +463,7 @@ HARBOUR HB___SETCENTURY( void )
    hb_retl( old_century_setting );
 }
 
-HARBOUR HB_SET( void )
+HB_FUNC( SET )
 {
    BOOL bFlag;
    int args = hb_pcount();
diff --git a/harbour/source/rtl/setcolor.c b/harbour/source/rtl/setcolor.c
index c893cbd52c..5d0be52495 100644
--- a/harbour/source/rtl/setcolor.c
+++ b/harbour/source/rtl/setcolor.c
@@ -49,18 +49,18 @@ char * hb_setColor( char * szColor )
    return hb_set.HB_SET_COLOR;
 }
 
-HARBOUR HB_SETCOLOR( void )
+HB_FUNC( SETCOLOR )
 {
    hb_retc( hb_setColor( ISCHAR( 1 ) ? hb_parc( 1 ) : NULL ) );
 }
 
-HARBOUR HB_COLORSELECT( void )
+HB_FUNC( COLORSELECT )
 {
    if( ISNUM( 1 ) )
       hb_gtColorSelect( hb_parni( 1 ) );
 }
 
-HARBOUR HB_SETBLINK( void )
+HB_FUNC( SETBLINK )
 {
    BOOL bPreviousBlink;
 
diff --git a/harbour/source/rtl/setcurs.c b/harbour/source/rtl/setcurs.c
index 209d065283..6c793c8bf1 100644
--- a/harbour/source/rtl/setcurs.c
+++ b/harbour/source/rtl/setcurs.c
@@ -49,7 +49,7 @@ USHORT hb_setCursor( BOOL bSetCursor, USHORT usNewCursor )
    return usPreviousCursor;
 }
 
-HARBOUR HB_SETCURSOR( void )
+HB_FUNC( SETCURSOR )
 {
    hb_retni( hb_setCursor( ISNUM( 1 ), hb_parni( 1 ) ) );
 }
diff --git a/harbour/source/rtl/setpos.c b/harbour/source/rtl/setpos.c
index 01c6a9ab40..80149313ab 100644
--- a/harbour/source/rtl/setpos.c
+++ b/harbour/source/rtl/setpos.c
@@ -50,14 +50,14 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_SETPOS( void ) /* Sets the screen position */
+HB_FUNC( SETPOS ) /* Sets the screen position */
 {
    if( ISNUM( 1 ) && ISNUM( 2 ) )
       hb_gtSetPos( hb_parni( 1 ), hb_parni( 2 ) );
 }
 
 /* Move the screen position to the right by one column */
-HARBOUR HB_SETPOSBS( void )
+HB_FUNC( SETPOSBS )
 {
    SHORT iRow, iCol;
 
@@ -67,7 +67,7 @@ HARBOUR HB_SETPOSBS( void )
    hb_gtSetPos( iRow, iCol + 1 );
 }
 
-HARBOUR HB_ROW( void ) /* Return the current screen row position (zero origin) */
+HB_FUNC( ROW ) /* Return the current screen row position (zero origin) */
 {
    SHORT iRow;
    SHORT iCol;
@@ -77,7 +77,7 @@ HARBOUR HB_ROW( void ) /* Return the current screen row position (zero origin) *
    hb_retni( iRow );
 }
 
-HARBOUR HB_COL( void ) /* Return the current screen column position (zero origin) */
+HB_FUNC( COL ) /* Return the current screen column position (zero origin) */
 {
    SHORT iRow;
    SHORT iCol;
diff --git a/harbour/source/rtl/shadow.c b/harbour/source/rtl/shadow.c
index 605ae8d92e..c40ca6e04b 100644
--- a/harbour/source/rtl/shadow.c
+++ b/harbour/source/rtl/shadow.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_HB_SHADOW( void )
+HB_FUNC( HB_SHADOW )
 {
    if( hb_pcount() >= 4 )
       hb_gtDrawShadow( hb_parni( 1 ),
@@ -46,8 +46,8 @@ HARBOUR HB_HB_SHADOW( void )
                        ISNUM( 5 ) ? hb_parni( 5 ) : 7 );
 }
 
-HARBOUR HB_DBGSHADOW( void )
+HB_FUNC( DBGSHADOW )
 {
-   HB_HB_SHADOW();
+   HB_FUNCNAME( HB_SHADOW )();
 }
 
diff --git a/harbour/source/rtl/soundex.c b/harbour/source/rtl/soundex.c
index e449678ed0..017807593e 100644
--- a/harbour/source/rtl/soundex.c
+++ b/harbour/source/rtl/soundex.c
@@ -40,7 +40,7 @@
 
 #define SOUNDEX_LEN_MAX         4
 
-HARBOUR HB_SOUNDEX( void )
+HB_FUNC( SOUNDEX )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
    char szResult[ SOUNDEX_LEN_MAX + 1 ];
diff --git a/harbour/source/rtl/space.c b/harbour/source/rtl/space.c
index 92c107749a..0b6d6306b4 100644
--- a/harbour/source/rtl/space.c
+++ b/harbour/source/rtl/space.c
@@ -39,7 +39,7 @@
 
 /* returns n copies of a single space */
 /* TEST: QOUT( "space( 5 ) = '" + space( 5 ) + "'" ) */
-HARBOUR HB_SPACE( void )
+HB_FUNC( SPACE )
 {
    if( ISNUM( 1 ) )
    {
diff --git a/harbour/source/rtl/str.c b/harbour/source/rtl/str.c
index 85293cb37a..494b8b1576 100644
--- a/harbour/source/rtl/str.c
+++ b/harbour/source/rtl/str.c
@@ -37,7 +37,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_STR( void )
+HB_FUNC( STR )
 {
    BOOL bValid;
    PHB_ITEM pNumber = hb_param( 1, IT_NUMERIC );
diff --git a/harbour/source/rtl/strcase.c b/harbour/source/rtl/strcase.c
index 9b125e6186..ea9f4c45f7 100644
--- a/harbour/source/rtl/strcase.c
+++ b/harbour/source/rtl/strcase.c
@@ -81,7 +81,7 @@ char * hb_strncpyUpper( char * pDest, const char * pSource, ULONG ulLen )
 }
 
 /* converts string to lower case */
-HARBOUR HB_LOWER( void )
+HB_FUNC( LOWER )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
@@ -107,7 +107,7 @@ HARBOUR HB_LOWER( void )
 }
 
 /* converts string to upper case */
-HARBOUR HB_UPPER( void )
+HB_FUNC( UPPER )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/strtran.c b/harbour/source/rtl/strtran.c
index 66bdf375df..3f8e3c5e64 100644
--- a/harbour/source/rtl/strtran.c
+++ b/harbour/source/rtl/strtran.c
@@ -43,7 +43,7 @@
 
 /* replaces lots of characters in a string */
 /* TOFIX: Will not work with a search string of > 64 KB on some platforms */
-HARBOUR HB_STRTRAN( void )
+HB_FUNC( STRTRAN )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/strzero.c b/harbour/source/rtl/strzero.c
index cd4160754c..d4dd3f16d1 100644
--- a/harbour/source/rtl/strzero.c
+++ b/harbour/source/rtl/strzero.c
@@ -37,7 +37,7 @@
 #include "hbapiitm.h"
 #include "hbapierr.h"
 
-HARBOUR HB_STRZERO( void )
+HB_FUNC( STRZERO )
 {
    if( hb_pcount() >= 1 && hb_pcount() <= 3 )
    {
diff --git a/harbour/source/rtl/stuff.c b/harbour/source/rtl/stuff.c
index 053c13db3f..f0bbe1c18c 100644
--- a/harbour/source/rtl/stuff.c
+++ b/harbour/source/rtl/stuff.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 
 /* replaces characters in a string */
-HARBOUR HB_STUFF( void )
+HB_FUNC( STUFF )
 {
    if( ISCHAR( 1 ) && ISNUM( 2 ) && ISNUM( 3 ) && ISCHAR( 4 ) )
    {
diff --git a/harbour/source/rtl/substr.c b/harbour/source/rtl/substr.c
index 56ddacb8b0..af95305389 100644
--- a/harbour/source/rtl/substr.c
+++ b/harbour/source/rtl/substr.c
@@ -39,7 +39,7 @@
 
 /* returns l characters from n characters into string */
 
-HARBOUR HB_SUBSTR( void )
+HB_FUNC( SUBSTR )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/tone.c b/harbour/source/rtl/tone.c
index 6169da1f59..4327f6da52 100644
--- a/harbour/source/rtl/tone.c
+++ b/harbour/source/rtl/tone.c
@@ -60,7 +60,7 @@
 #include "hbapi.h"
 #include "hbapigt.h"
 
-HARBOUR HB_TONE( void )
+HB_FUNC( TONE )
 {
    if( ISNUM( 1 ) )
       hb_gtTone( hb_parnd( 1 ), ( ISNUM( 2 ) ? hb_parnd( 2 ) : 1.0 ) );
diff --git a/harbour/source/rtl/trace.c b/harbour/source/rtl/trace.c
index 6024a9b897..7b79ed1907 100644
--- a/harbour/source/rtl/trace.c
+++ b/harbour/source/rtl/trace.c
@@ -35,12 +35,12 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_HB_TRACESTATE( void )
+HB_FUNC( HB_TRACESTATE )
 {
    hb_retni( hb_tracestate( ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
 }
 
-HARBOUR HB_HB_TRACELEVEL( void )
+HB_FUNC( HB_TRACELEVEL )
 {
    hb_retni( hb_tracelevel( ISNUM( 1 ) ? hb_parni( 1 ) : -1 ) );
 }
diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c
index 222e36813e..7ec7aa4df2 100644
--- a/harbour/source/rtl/transfrm.c
+++ b/harbour/source/rtl/transfrm.c
@@ -328,7 +328,7 @@ static char * NumPicture( char * szPic, ULONG ulPicLen, USHORT * puiPicFlags, do
    return szResult;
 }
 
-HARBOUR HB_TRANSFORM( void )
+HB_FUNC( TRANSFORM )
 {
    PHB_ITEM pExp = hb_param( 1, IT_ANY ); /* Input parameter */
    PHB_ITEM pPic = hb_param( 2, IT_STRING ); /* Picture string */
diff --git a/harbour/source/rtl/trim.c b/harbour/source/rtl/trim.c
index 24b35ab6b6..4e3afcc788 100644
--- a/harbour/source/rtl/trim.c
+++ b/harbour/source/rtl/trim.c
@@ -74,7 +74,7 @@ ULONG hb_strRTrimLen( const char * szText, ULONG ulLen, BOOL bAnySpace )
 /* trims leading spaces from a string */
 /* TEST: QOUT( "ltrim( '  hello world  ' ) = '" + ltrim( '  hello world  ' ) + "'" ) */
 
-HARBOUR HB_LTRIM( void )
+HB_FUNC( LTRIM )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
@@ -101,7 +101,7 @@ HARBOUR HB_LTRIM( void )
 
 /* trims trailing spaces from a string */
 /* TEST: QOUT( "rtrim( '  hello world  ' ) = '" + rtrim( '  hello world  ' ) + "'" ) */
-HARBOUR HB_RTRIM( void )
+HB_FUNC( RTRIM )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
@@ -128,16 +128,16 @@ HARBOUR HB_RTRIM( void )
 /* NOTE: The second parameter is a Harbour extension [vszakats] */
 
 /* synonymn for RTRIM */
-HARBOUR HB_TRIM( void )
+HB_FUNC( TRIM )
 {
-   HB_RTRIM();
+   HB_FUNCNAME( RTRIM )();
 }
 
 /* NOTE: The second parameter is a Harbour extension [vszakats] */
 
 /* trims leading and trailing spaces from a string */
 /* TEST: QOUT( "alltrim( '  hello world  ' ) = '" + alltrim( '  hello world  ' ) + "'" ) */
-HARBOUR HB_ALLTRIM( void )
+HB_FUNC( ALLTRIM )
 {
    if( ISCHAR( 1 ) )
    {
diff --git a/harbour/source/rtl/type.c b/harbour/source/rtl/type.c
index af4346e060..26b3e93647 100644
--- a/harbour/source/rtl/type.c
+++ b/harbour/source/rtl/type.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapierr.h"
 
-HARBOUR HB_TYPE( void )
+HB_FUNC( TYPE )
 {
    HB_ITEM_PTR pItem = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/val.c b/harbour/source/rtl/val.c
index a66a00c256..27c06c6dab 100644
--- a/harbour/source/rtl/val.c
+++ b/harbour/source/rtl/val.c
@@ -46,7 +46,7 @@ double hb_strVal( const char * szText )
 }
 
 /* returns the numeric value of a character string representation of a number  */
-HARBOUR HB_VAL( void )
+HB_FUNC( VAL )
 {
    PHB_ITEM pText = hb_param( 1, IT_STRING );
 
diff --git a/harbour/source/rtl/valtostr.c b/harbour/source/rtl/valtostr.c
index ae80a9af67..e5ff9ed98c 100644
--- a/harbour/source/rtl/valtostr.c
+++ b/harbour/source/rtl/valtostr.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_HB_VALTOSTR( void )
+HB_FUNC( HB_VALTOSTR )
 {
    ULONG ulLen;
    BOOL bFreeReq;
diff --git a/harbour/source/rtl/valtype.c b/harbour/source/rtl/valtype.c
index 43871f5611..befdfca584 100644
--- a/harbour/source/rtl/valtype.c
+++ b/harbour/source/rtl/valtype.c
@@ -67,7 +67,7 @@ char * hb_valtypeGet( HB_ITEM_PTR pItem )
    return "U";
 }
 
-HARBOUR HB_VALTYPE( void )
+HB_FUNC( VALTYPE )
 {
    hb_retc( hb_valtypeGet( hb_param( 1, IT_ANY ) ) );
 }
diff --git a/harbour/source/rtl/word.c b/harbour/source/rtl/word.c
index d32e0ab9c9..bb9d0b92cc 100644
--- a/harbour/source/rtl/word.c
+++ b/harbour/source/rtl/word.c
@@ -40,7 +40,7 @@
          in CALL commands parameter list, otherwise it will return
          NIL, in Harbour it will work anywhere. */
 
-HARBOUR HB_WORD( void )
+HB_FUNC( WORD )
 {
    if( ISNUM( 1 ) )
       hb_retni( hb_parni( 1 ) );
diff --git a/harbour/source/rtl/xhelp.c b/harbour/source/rtl/xhelp.c
index 372953b06c..b5b8760695 100644
--- a/harbour/source/rtl/xhelp.c
+++ b/harbour/source/rtl/xhelp.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbvm.h"
 
-HARBOUR HB___XHELP( void )
+HB_FUNC( __XHELP )
 {
    PHB_DYNS pDynSym = hb_dynsymFind( "HELP" );
 
diff --git a/harbour/source/tools/asciisum.c b/harbour/source/tools/asciisum.c
index 04a8631d07..201cc73513 100644
--- a/harbour/source/tools/asciisum.c
+++ b/harbour/source/tools/asciisum.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_ASCIISUM( void )
+HB_FUNC( GT_ASCIISUM )
 {
 	char *str;
    int  len, i;
diff --git a/harbour/source/tools/ascpos.c b/harbour/source/tools/ascpos.c
index cf30bf159e..3f593d94c6 100644
--- a/harbour/source/tools/ascpos.c
+++ b/harbour/source/tools/ascpos.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_ASCPOS( void )
+HB_FUNC( GT_ASCPOS )
 {
   char *s;
   ULONG p;
diff --git a/harbour/source/tools/atdiff.c b/harbour/source/tools/atdiff.c
index 8439b8db2f..c375bcd93a 100644
--- a/harbour/source/tools/atdiff.c
+++ b/harbour/source/tools/atdiff.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_ATDIFF( void )
+HB_FUNC( GT_ATDIFF )
 {
   char *s1, *s2;
   int pos, len;
diff --git a/harbour/source/tools/chareven.c b/harbour/source/tools/chareven.c
index 2d7550b95f..2dc712d4f3 100644
--- a/harbour/source/tools/chareven.c
+++ b/harbour/source/tools/chareven.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHAREVEN( void )
+HB_FUNC( GT_CHAREVEN )
 {
   char *s1, *s2;
   int len, i;
diff --git a/harbour/source/tools/charmix.c b/harbour/source/tools/charmix.c
index 489d8560b5..37a09205f7 100644
--- a/harbour/source/tools/charmix.c
+++ b/harbour/source/tools/charmix.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHARMIX( void )
+HB_FUNC( GT_CHARMIX )
 {
   char *s1, *s2, *s3;
   int l1, l2, i, pos3;
diff --git a/harbour/source/tools/charodd.c b/harbour/source/tools/charodd.c
index 9e0272eb84..3edd6bf028 100644
--- a/harbour/source/tools/charodd.c
+++ b/harbour/source/tools/charodd.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHARODD( void )
+HB_FUNC( GT_CHARODD )
 {
   char *s1, *s2;
   int len, i;
diff --git a/harbour/source/tools/chrcount.c b/harbour/source/tools/chrcount.c
index c6e715c0a2..2b274c738a 100644
--- a/harbour/source/tools/chrcount.c
+++ b/harbour/source/tools/chrcount.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHRCOUNT( void )
+HB_FUNC( GT_CHRCOUNT )
 {
   char *s1, *s2;
   int count, pos2, len;
diff --git a/harbour/source/tools/chrfirst.c b/harbour/source/tools/chrfirst.c
index d381204469..f86733bc07 100644
--- a/harbour/source/tools/chrfirst.c
+++ b/harbour/source/tools/chrfirst.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHRFIRST( void )
+HB_FUNC( GT_CHRFIRST )
 {
   char *string;
   char *cset;
diff --git a/harbour/source/tools/chrtotal.c b/harbour/source/tools/chrtotal.c
index 942d8bef9e..f358f89bfa 100644
--- a/harbour/source/tools/chrtotal.c
+++ b/harbour/source/tools/chrtotal.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_CHRTOTAL( void )
+HB_FUNC( GT_CHRTOTAL )
 {
   char *s1, *s2;
   int count, p1, p2, l2, l1;
diff --git a/harbour/source/tools/ctchksum.c b/harbour/source/tools/ctchksum.c
index 7678306f80..dd8bfbb35a 100644
--- a/harbour/source/tools/ctchksum.c
+++ b/harbour/source/tools/ctchksum.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_CT_CHECKSUM( void )
+HB_FUNC( CT_CHECKSUM )
 {
    BYTE * pbyString = ( BYTE * ) hb_parc( 1 );
    ULONG ulLen = hb_parclen( 1 );
diff --git a/harbour/source/tools/ctchrmix.c b/harbour/source/tools/ctchrmix.c
index 0d3a87f472..12f416432e 100644
--- a/harbour/source/tools/ctchrmix.c
+++ b/harbour/source/tools/ctchrmix.c
@@ -38,7 +38,7 @@
 
 /* NOTE: CA-Tools will hang if the second parameter is an empty string */
 
-HARBOUR HB_CT_CHARMIX( void )
+HB_FUNC( CT_CHARMIX )
 {
    PHB_ITEM pStr1 = hb_param( 1, IT_STRING );
    PHB_ITEM pStr2 = hb_param( 2, IT_STRING );
diff --git a/harbour/source/tools/ctcrypt.c b/harbour/source/tools/ctcrypt.c
index c36e2d2a4d..c07c390bd7 100644
--- a/harbour/source/tools/ctcrypt.c
+++ b/harbour/source/tools/ctcrypt.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_CT_CRYPT( void )
+HB_FUNC( CT_CRYPT )
 {
    ULONG ulCryptLen = hb_parclen( 2 );
 
diff --git a/harbour/source/tools/dates2.c b/harbour/source/tools/dates2.c
index dc25756ec6..06b15f1a7b 100644
--- a/harbour/source/tools/dates2.c
+++ b/harbour/source/tools/dates2.c
@@ -108,7 +108,7 @@ long hb_woy( long lDay, long lMonth, long lYear, BOOL bISO )
    return iWeek;
 }
 
-HARBOUR HB_AMONTHS( void )
+HB_FUNC( AMONTHS )
 {
    PHB_ITEM pReturn = hb_itemArrayNew( 12 );    /* Create array */
    PHB_ITEM pString;
@@ -125,7 +125,7 @@ HARBOUR HB_AMONTHS( void )
    hb_itemRelease( pReturn );
 }
 
-HARBOUR HB_ADAYS( void )
+HB_FUNC( ADAYS )
 {
    PHB_ITEM pReturn = hb_itemArrayNew( 7 );    /* Create array */
    PHB_ITEM pString;
@@ -142,7 +142,7 @@ HARBOUR HB_ADAYS( void )
    hb_itemRelease( pReturn );
 }
 
-HARBOUR HB_ISLEAPYEAR( void )
+HB_FUNC( ISLEAPYEAR )
 {
    if( ISDATE( 1 ) )
    {
@@ -158,7 +158,7 @@ HARBOUR HB_ISLEAPYEAR( void )
    }
 }
 
-HARBOUR HB_DAYSINMONTH( void )
+HB_FUNC( DAYSINMONTH )
 {
    if( ISDATE( 1 ) )
    {
@@ -172,7 +172,7 @@ HARBOUR HB_DAYSINMONTH( void )
       hb_retni( 0 );
 }
 
-HARBOUR HB_EOM( void )
+HB_FUNC( EOM )
 {
    if( ISDATE( 1 ) )
    {
@@ -189,7 +189,7 @@ HARBOUR HB_EOM( void )
       hb_retds( "" );
 }
 
-HARBOUR HB_BOM( void )
+HB_FUNC( BOM )
 {
    if( ISDATE( 1 ) )
    {
@@ -205,7 +205,7 @@ HARBOUR HB_BOM( void )
       hb_retds( "" );
 }
 
-HARBOUR HB_WOM( void )
+HB_FUNC( WOM )
 {
    if( ISDATE( 1 ) )
    {
@@ -219,7 +219,7 @@ HARBOUR HB_WOM( void )
       hb_retni( 0 );
 }
 
-HARBOUR HB_DOY( void )
+HB_FUNC( DOY )
 {
    if( ISDATE( 1 ) )
    {
@@ -235,7 +235,7 @@ HARBOUR HB_DOY( void )
 
 /* Return the nWeek of the year (1 - 52, 0 - 52 if ISO) */
 
-HARBOUR HB_WOY( void )
+HB_FUNC( WOY )
 {
    if( ISDATE( 1 ) )
    {
@@ -249,7 +249,7 @@ HARBOUR HB_WOY( void )
       hb_retni( 0 );
 }
 
-HARBOUR HB_EOY( void )
+HB_FUNC( EOY )
 {
    if( ISDATE( 1 ) )
    {
@@ -265,7 +265,7 @@ HARBOUR HB_EOY( void )
       hb_retds( "" );
 }
 
-HARBOUR HB_BOY( void )
+HB_FUNC( BOY )
 {
    if( ISDATE( 1 ) )
    {
@@ -281,7 +281,7 @@ HARBOUR HB_BOY( void )
       hb_retds( "" );
 }
 
-HARBOUR HB_DATETIME( void )
+HB_FUNC( DATETIME )
 {
    time_t current_time;
    char * szResult = ( char * ) hb_xgrab( 26 );
diff --git a/harbour/source/tools/dbftools.c b/harbour/source/tools/dbftools.c
index ad6330f880..2b920fe6cb 100644
--- a/harbour/source/tools/dbftools.c
+++ b/harbour/source/tools/dbftools.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbapirdd.h"
  
-HARBOUR HB_FIELDTYPE( void )
+HB_FUNC( FIELDTYPE )
 {
    USHORT uiField;
    LPFIELD pField;
@@ -49,7 +49,7 @@ HARBOUR HB_FIELDTYPE( void )
    hb_retc( ( char * ) &( pField->uiType ) );
 }
 
-HARBOUR HB_FIELDSIZE( void )
+HB_FUNC( FIELDSIZE )
 {
    USHORT uiField;
    LPFIELD pField;
@@ -62,7 +62,7 @@ HARBOUR HB_FIELDSIZE( void )
    hb_retni( pField->uiLen );
 }
 
-HARBOUR HB_FIELDDECI( void )
+HB_FUNC( FIELDDECI )
 {
    USHORT uiField;
    LPFIELD pField;
diff --git a/harbour/source/tools/hb_f.c b/harbour/source/tools/hb_f.c
index f1cbd759a5..23c384c90d 100644
--- a/harbour/source/tools/hb_f.c
+++ b/harbour/source/tools/hb_f.c
@@ -53,8 +53,7 @@ static long last_off[10];
 static long lastbyte[10];
 static int isEof[10];
 
-HARBOUR HB_HB_FUSE( void )
-
+HB_FUNC( HB_FUSE )
 {
 
    PHB_ITEM arg1_it = hb_param(1,IT_STRING);
@@ -92,15 +91,13 @@ HARBOUR HB_HB_FUSE( void )
 }
 
 
-HARBOUR HB_HB_FRECNO( void )
-
+HB_FUNC( HB_FRECNO )
 {
    hb_retnl( recno[area] );
 }
 
 
-HARBOUR HB_HB_FSKIP( void )
-
+HB_FUNC( HB_FSKIP )
 {
 
    PHB_ITEM arg1_it = hb_param(1,IT_NUMERIC);
@@ -183,8 +180,7 @@ static long hb_hbfskip( int recs )
    return ( recno[area] );
 }
 
-HARBOUR HB_HB_FREADLN( void )
-
+HB_FUNC( HB_FREADLN )
 {
 
    int x;
@@ -204,16 +200,12 @@ HARBOUR HB_HB_FREADLN( void )
 
 }
 
-HARBOUR HB_HB_FEOF( void )
-
+HB_FUNC( HB_FEOF )
 {
-
    hb_retl( isEof[area] );
-
 }
 
-HARBOUR HB_HB_FGOTO( void )
-
+HB_FUNC( HB_FGOTO )
 {
 
    long target;
@@ -239,10 +231,8 @@ HARBOUR HB_HB_FGOTO( void )
    }
 }
 
-HARBOUR HB_HB_FGOBOTTOM(void)
-
+HB_FUNC( HB_FGOBOTTOM )
 {
-
    int x;
    int len;
    long loc;
@@ -274,43 +264,34 @@ HARBOUR HB_HB_FGOBOTTOM(void)
 
       last_rec[area] = --recno[area];
       last_off[area] = offset[area];
-
    }
 }
 
-HARBOUR HB_HB_FGOTOP( void )
+HB_FUNC( HB_FGOTOP )
 {
-
    offset[area] = 0L;
    recno[area] = 1L;
-
 }
 
-HARBOUR HB_HB_FLASTREC( void )
+HB_FUNC( HB_FLASTREC )
 {
-
    long old_rec;
    long old_offset;
 
    old_rec = recno[area];
    old_offset = offset[area];
 
-   HB_HB_FGOBOTTOM();
+   HB_FUNCNAME( HB_FGOBOTTOM )();
    hb_retnl( last_rec[area] );
 
    recno[area] = old_rec;
    offset[area] = old_offset;
-
 }
 
-
-HARBOUR HB_HB_FSELECT( void )
-
+HB_FUNC( HB_FSELECT )
 {
-
    hb_retni( area + 1 );
 
    if ( ISNUM(1) )
       area = hb_parni(1) - 1;
-
 }
diff --git a/harbour/source/tools/io.c b/harbour/source/tools/io.c
index 77813f3e98..a5631378d2 100644
--- a/harbour/source/tools/io.c
+++ b/harbour/source/tools/io.c
@@ -10,7 +10,7 @@
    #include <bios.h>
 #endif
 
-HARBOUR HB_CD( void )
+HB_FUNC( CD )
 {
 #if defined(HB_OS_DOS)
    hb_retni( ISCHAR( 1 ) ? chdir( hb_parc( 1 ) ) : 0 );
@@ -19,7 +19,7 @@ HARBOUR HB_CD( void )
 #endif
 }
 
-HARBOUR HB_MD( void )
+HB_FUNC( MD )
 {
 #if defined(HB_OS_DOS)
    hb_retni( ISCHAR( 1 ) ? mkdir( hb_parc( 1 ) ) : 0 );
@@ -28,7 +28,7 @@ HARBOUR HB_MD( void )
 #endif
 }
 
-HARBOUR HB_RD( void )
+HB_FUNC( RD )
 {
 #if defined(HB_OS_DOS)
    hb_retni( ISCHAR( 1 ) ? rmdir( hb_parc( 1 ) ) : 0 );
@@ -37,7 +37,7 @@ HARBOUR HB_RD( void )
 #endif
 }
 
-HARBOUR HB_DISKUSED( void )
+HB_FUNC( DISKUSED )
 {
 #if defined(HB_OS_DOS)
    struct diskfree_t disk;
@@ -58,7 +58,7 @@ HARBOUR HB_DISKUSED( void )
 #endif
 }
 
-HARBOUR HB_DISKFREE( void )
+HB_FUNC( DISKFREE )
 {
 #if defined(HB_OS_DOS)
    struct diskfree_t disk;
@@ -73,7 +73,7 @@ HARBOUR HB_DISKFREE( void )
 #endif
 }
 
-HARBOUR HB_DISKFULL( void )
+HB_FUNC( DISKFULL )
 {
 #if defined(HB_OS_DOS)
    struct diskfree_t disk;
diff --git a/harbour/source/tools/mathx.c b/harbour/source/tools/mathx.c
index 188db1ebed..9bd0467fb6 100644
--- a/harbour/source/tools/mathx.c
+++ b/harbour/source/tools/mathx.c
@@ -9,7 +9,7 @@
 #define M_PI_2      1.57079632679489661923
 #endif
 
-HARBOUR HB_ACOS( void )
+HB_FUNC( ACOS )
 {
    if( hb_pcount() > 0 )
    {
@@ -26,7 +26,7 @@ HARBOUR HB_ACOS( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_ASIN( void )
+HB_FUNC( ASIN )
 {
    if( hb_pcount() > 0 )
    {
@@ -43,7 +43,7 @@ HARBOUR HB_ASIN( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_ATAN( void )
+HB_FUNC( ATAN )
 {
    if( hb_pcount() > 0 )
    {
@@ -60,7 +60,7 @@ HARBOUR HB_ATAN( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_COS( void )
+HB_FUNC( COS )
 {
    if( hb_pcount() > 0 )
    {
@@ -71,7 +71,7 @@ HARBOUR HB_COS( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_COSH( void )
+HB_FUNC( COSH )
 {
    if( hb_pcount() > 0 )
    {
@@ -82,7 +82,7 @@ HARBOUR HB_COSH( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_LOG10( void )
+HB_FUNC( LOG10 )
 {
    if( hb_pcount() > 0 )
    {
@@ -93,7 +93,7 @@ HARBOUR HB_LOG10( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_SIN( void )
+HB_FUNC( SIN )
 {
    if( hb_pcount() > 0 )
    {
@@ -104,7 +104,7 @@ HARBOUR HB_SIN( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_SINH( void )
+HB_FUNC( SINH )
 {
    if( hb_pcount() > 0 )
    {
@@ -115,7 +115,7 @@ HARBOUR HB_SINH( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_TAN( void )
+HB_FUNC( TAN )
 {
    if( hb_pcount() > 0 )
    {
@@ -126,7 +126,7 @@ HARBOUR HB_TAN( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_TANH( void )
+HB_FUNC( TANH )
 {
    if( hb_pcount() > 0 )
    {
@@ -137,7 +137,8 @@ HARBOUR HB_TANH( void )
       hb_retnd(0);
 }
 
-HARBOUR HB_PI( void )
+HB_FUNC( PI )
 {
    hb_retnd( 3.141592653589793 );
 }
+
diff --git a/harbour/source/tools/strcount.c b/harbour/source/tools/strcount.c
index f9e925505a..886d6587e3 100644
--- a/harbour/source/tools/strcount.c
+++ b/harbour/source/tools/strcount.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_STRCOUNT( void )
+HB_FUNC( GT_STRCOUNT )
 {
   char *s1, *s2;
   int count, p1, p2, l1, l2;
diff --git a/harbour/source/tools/strcspn.c b/harbour/source/tools/strcspn.c
index 045d401b96..0f62a8a6b2 100644
--- a/harbour/source/tools/strcspn.c
+++ b/harbour/source/tools/strcspn.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_STRCSPN( void )
+HB_FUNC( GT_STRCSPN )
 {
   char *string;
   char *cset;
diff --git a/harbour/source/tools/strdiff.c b/harbour/source/tools/strdiff.c
index 95272d1e6e..43524ebe03 100644
--- a/harbour/source/tools/strdiff.c
+++ b/harbour/source/tools/strdiff.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_STRDIFF( void )
+HB_FUNC( GT_STRDIFF )
 {
   char *s1, *s2;
   int pos, len;
diff --git a/harbour/source/tools/strexpan.c b/harbour/source/tools/strexpan.c
index 0c985f0462..f8f2b35fbe 100644
--- a/harbour/source/tools/strexpan.c
+++ b/harbour/source/tools/strexpan.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_STREXPAND( void )
+HB_FUNC( GT_STREXPAND )
 {
   char *in, *out;
   int  nIns = 1;
diff --git a/harbour/source/tools/strfmt.c b/harbour/source/tools/strfmt.c
index 11c11a3c08..c9393703f0 100644
--- a/harbour/source/tools/strfmt.c
+++ b/harbour/source/tools/strfmt.c
@@ -37,7 +37,7 @@
 
 #define HB_STRFORMAT_PARNUM_MAX_ 9
 
-HARBOUR HB_STRFORMAT (void) /* StrFormat() */
+HB_FUNC( STRFORMAT )
 {
    char* pszMask = hb_parc(1);
    ULONG nMaskLen = hb_parclen(1);
diff --git a/harbour/source/tools/stringsx.c b/harbour/source/tools/stringsx.c
index 89d1e82da9..dfe7ce2ed0 100644
--- a/harbour/source/tools/stringsx.c
+++ b/harbour/source/tools/stringsx.c
@@ -57,7 +57,7 @@ char *hb_strtoken(char *szText,
 }
 
 /* returns the nth occurence of a substring within a token-delimited string */
-HARBOUR HB_STRTOKEN( void )
+HB_FUNC( STRTOKEN )
 {
   char *szText;
   long lIndex = hb_parnl(2);
@@ -74,7 +74,7 @@ HARBOUR HB_STRTOKEN( void )
 }
 
 /* debug function to dump the ASCII values of an entire string */
-HARBOUR HB_STRDUMP( void )
+HB_FUNC( STRDUMP )
 {
   char *szText = hb_parc(1);
   long i, lLength = hb_parclen(1);
@@ -83,7 +83,7 @@ HARBOUR HB_STRDUMP( void )
   printf("\n");
 }
 
-HARBOUR HB_ROT13( void )
+HB_FUNC( ROT13 )
 {
   if( ISCHAR(1) )
     {
diff --git a/harbour/source/tools/strleft.c b/harbour/source/tools/strleft.c
index 7a0704019e..f80b594762 100644
--- a/harbour/source/tools/strleft.c
+++ b/harbour/source/tools/strleft.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_STRLEFT( void )
+HB_FUNC( GT_STRLEFT )
 {
   char *string;
   char *cset;
diff --git a/harbour/source/tools/strpbrk.c b/harbour/source/tools/strpbrk.c
index 41aeb86a33..ab2b8ec5a2 100644
--- a/harbour/source/tools/strpbrk.c
+++ b/harbour/source/tools/strpbrk.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_STRPBRK( void )
+HB_FUNC( GT_STRPBRK )
 {
   char *string;
   char *cset;
diff --git a/harbour/source/tools/strright.c b/harbour/source/tools/strright.c
index d035023b6b..95159b38f2 100644
--- a/harbour/source/tools/strright.c
+++ b/harbour/source/tools/strright.c
@@ -19,7 +19,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_GT_STRRIGHT( void )
+HB_FUNC( GT_STRRIGHT )
 {
   char *string;
   char *cset;
diff --git a/harbour/source/vm/arrayshb.c b/harbour/source/vm/arrayshb.c
index f54be12b31..1219ffae19 100644
--- a/harbour/source/vm/arrayshb.c
+++ b/harbour/source/vm/arrayshb.c
@@ -61,7 +61,7 @@ static void hb_arrayNewRagged( PHB_ITEM pArray, int iDimension )
    }
 }
 
-HARBOUR HB_ARRAY( void )
+HB_FUNC( ARRAY )
 {
    int iPCount = hb_pcount();
 
@@ -91,7 +91,7 @@ HARBOUR HB_ARRAY( void )
    }
 }
 
-HARBOUR HB_AADD( void )
+HB_FUNC( AADD )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
 
@@ -119,7 +119,7 @@ HARBOUR HB_AADD( void )
 /* NOTE: CA-Cl*pper 5.3 and older will return NIL on bad parameter, 5.3a,b
          will throw a runtime error. [vszakats] */
 
-HARBOUR HB_ASIZE( void )
+HB_FUNC( ASIZE )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
 
@@ -137,7 +137,7 @@ HARBOUR HB_ASIZE( void )
 #endif
 }
 
-HARBOUR HB_ATAIL( void )
+HB_FUNC( ATAIL )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
 
@@ -145,7 +145,7 @@ HARBOUR HB_ATAIL( void )
       hb_arrayLast( pArray, &hb_stack.Return );
 }
 
-HARBOUR HB_AINS( void )
+HB_FUNC( AINS )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
 
@@ -158,7 +158,7 @@ HARBOUR HB_AINS( void )
    }
 }
 
-HARBOUR HB_ADEL( void )
+HB_FUNC( ADEL )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
 
@@ -171,7 +171,7 @@ HARBOUR HB_ADEL( void )
    }
 }
 
-HARBOUR HB_AFILL( void )
+HB_FUNC( AFILL )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
 
@@ -194,7 +194,7 @@ HARBOUR HB_AFILL( void )
    }
 }
 
-HARBOUR HB_ASCAN( void )
+HB_FUNC( ASCAN )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
    PHB_ITEM pValue = hb_param( 2, IT_ANY );
@@ -213,7 +213,7 @@ HARBOUR HB_ASCAN( void )
       hb_retnl( 0 );
 }
 
-HARBOUR HB_AEVAL( void )
+HB_FUNC( AEVAL )
 {
    PHB_ITEM pArray = hb_param( 1, IT_ARRAY );
    PHB_ITEM pBlock = hb_param( 2, IT_BLOCK );
@@ -234,7 +234,7 @@ HARBOUR HB_AEVAL( void )
       hb_errRT_BASE( EG_ARG, 2017, NULL, "AEVAL" );
 }
 
-HARBOUR HB_ACOPY( void )
+HB_FUNC( ACOPY )
 {
    PHB_ITEM pSrcArray = hb_param( 1, IT_ARRAY );
    PHB_ITEM pDstArray = hb_param( 2, IT_ARRAY );
@@ -261,7 +261,7 @@ HARBOUR HB_ACOPY( void )
 
 /* NOTE: Clipper will return NIL if the parameter is not an array. [vszakats] */
 
-HARBOUR HB_ACLONE( void )
+HB_FUNC( ACLONE )
 {
    PHB_ITEM pSrcArray = hb_param( 1, IT_ARRAY );
 
diff --git a/harbour/source/vm/break.c b/harbour/source/vm/break.c
index cac5251280..f75ac207e8 100644
--- a/harbour/source/vm/break.c
+++ b/harbour/source/vm/break.c
@@ -41,7 +41,7 @@
          the BREAK statement, because both generate a BREAK() function
          call on the pcode level, we should drop the checking. [vszakats] */
 
-HARBOUR HB_BREAK( void )
+HB_FUNC( BREAK )
 {
    hb_vmRequestBreak( hb_param( 1, IT_ANY ) );
 }
diff --git a/harbour/source/vm/classes.c b/harbour/source/vm/classes.c
index 82c771183d..e7c130e580 100644
--- a/harbour/source/vm/classes.c
+++ b/harbour/source/vm/classes.c
@@ -391,7 +391,7 @@ ULONG hb_objHasMsg( PHB_ITEM pObject, char *szString )
  * <nType>     see HB_OO_MSG_*
  * <xInit>     Optional initializer for DATA
  */
-HARBOUR HB___CLSADDMSG( void )
+HB_FUNC( __CLSADDMSG )
 {
    USHORT uiClass = hb_parni( 1 );
 
@@ -519,7 +519,7 @@ HARBOUR HB___CLSADDMSG( void )
  * <nDatas>     Number of DATAs in the class
  * <hSuper>     Optional handle of superclass
  */
-HARBOUR HB___CLSNEW( void )
+HB_FUNC( __CLSNEW )
 {
    USHORT uiSuper = hb_parni( 3 );          /* Super class present */
    PCLASS pNewCls;
@@ -594,7 +594,7 @@ HARBOUR HB___CLSNEW( void )
  * <oObj>     Object
  * <cMessage> Message
  */
-HARBOUR HB___CLSDELMSG( void )
+HB_FUNC( __CLSDELMSG )
 {
    USHORT uiClass = hb_parni( 1 );
    PHB_ITEM pString = hb_param( 2, IT_STRING );
@@ -653,7 +653,7 @@ HARBOUR HB___CLSDELMSG( void )
  *
  * Create a new object from class definition <hClass>
  */
-HARBOUR HB___CLSINST( void )
+HB_FUNC( __CLSINST )
 {
    USHORT uiClass = hb_parni( 1 );
 
@@ -706,7 +706,7 @@ HARBOUR HB___CLSINST( void )
  *
  * Modify message (only for INLINE and METHOD)
  */
-HARBOUR HB___CLSMODMSG( void )
+HB_FUNC( __CLSMODMSG )
 {
    USHORT uiClass = hb_parni( 1 );
    PHB_ITEM pString = hb_param( 2, IT_STRING );
@@ -761,7 +761,7 @@ HARBOUR HB___CLSMODMSG( void )
  *
  * Returns class name of <hClass>
  */
-HARBOUR HB___OBJGETCLSNAME( void )
+HB_FUNC( __OBJGETCLSNAME )
 {
    PHB_ITEM pObject = hb_param( 0, IT_OBJECT );
    USHORT uiClass;
@@ -789,7 +789,7 @@ HARBOUR HB___OBJGETCLSNAME( void )
  *
  * Is <cSymbol> a valid message for the <oObj>
  */
-HARBOUR HB___OBJHASMSG( void )
+HB_FUNC( __OBJHASMSG )
 {
    PHB_ITEM pObject = hb_param( 1, IT_OBJECT );
    PHB_ITEM pString = hb_param( 2, IT_STRING );
@@ -806,7 +806,7 @@ HARBOUR HB___OBJHASMSG( void )
  *
  * Clone an object. Note the similarity with aClone ;-)
  */
-HARBOUR HB___OBJCLONE( void )
+HB_FUNC( __OBJCLONE )
 {
    PHB_ITEM pSrcObject = hb_param( 1, IT_OBJECT );
 
@@ -827,7 +827,7 @@ HARBOUR HB___OBJCLONE( void )
  *
  * Send a message to an object
  */
-HARBOUR HB___OBJSENDMSG( void )
+HB_FUNC( __OBJSENDMSG )
 {
    PHB_ITEM pObject  = hb_param( 1, IT_OBJECT );
    PHB_ITEM pMessage = hb_param( 2, IT_STRING );
@@ -858,7 +858,7 @@ HARBOUR HB___OBJSENDMSG( void )
  *
  * Instance super class and return class handle
  */
-HARBOUR HB___CLSINSTSUPER( void )
+HB_FUNC( __CLSINSTSUPER )
 {
    PHB_ITEM pString = hb_param( 1, IT_STRING );
    BOOL bFound = FALSE;
@@ -902,7 +902,7 @@ HARBOUR HB___CLSINSTSUPER( void )
  *
  * Return number of class datas
  */
-HARBOUR HB___CLS_CNTCLSDATA( void )
+HB_FUNC( __CLS_CNTCLSDATA )
 {
    USHORT uiClass = hb_parni( 1 );
 
@@ -919,7 +919,7 @@ HARBOUR HB___CLS_CNTCLSDATA( void )
  *
  * Return number of datas
  */
-HARBOUR HB___CLS_CNTDATA( void )
+HB_FUNC( __CLS_CNTDATA )
 {
    USHORT uiClass = hb_parni( 1 );
 
@@ -933,7 +933,7 @@ HARBOUR HB___CLS_CNTDATA( void )
  *
  * Return number of datas and decrease
  */
-HARBOUR HB___CLS_DECDATA( void )
+HB_FUNC( __CLS_DECDATA )
 {
    USHORT uiClass = hb_parni( 1 );
 
@@ -947,7 +947,7 @@ HARBOUR HB___CLS_DECDATA( void )
  *
  * Return number of datas and decrease
  */
-HARBOUR HB___CLS_INCDATA( void )
+HB_FUNC( __CLS_INCDATA )
 {
    USHORT uiClass = hb_parni( 1 );
 
@@ -957,36 +957,36 @@ HARBOUR HB___CLS_INCDATA( void )
 
 /* NOTE: Undocumented Clipper function */
 
-HARBOUR HB___CLASSNEW( void )
+HB_FUNC( __CLASSNEW )
 {
-   HB___CLSNEW();
+   HB_FUNCNAME( __CLSNEW )();
 }
 
 /* NOTE: Undocumented Clipper function */
 
-HARBOUR HB___CLASSINSTANCE( void )
+HB_FUNC( __CLASSINSTANCE )
 {
-   HB___CLSINST();
+   HB_FUNCNAME( __CLSINST )();
 }
 
 /* NOTE: Undocumented Clipper function */
 
-HARBOUR HB___CLASSADD( void )
+HB_FUNC( __CLASSADD )
 {
-   HB___CLSADDMSG();
+   HB_FUNCNAME( __CLSADDMSG )();
 }
 
 /* NOTE: Undocumented Clipper function */
 
-HARBOUR HB___CLASSNAME( void )
+HB_FUNC( __CLASSNAME )
 {
-   HB___OBJGETCLSNAME();
+   HB_FUNCNAME( __OBJGETCLSNAME )();
 }
 
 /* NOTE: Undocumented Clipper function */
 /* NOTE: Based on hb___msgClsSel() */
 
-HARBOUR HB___CLASSSEL( void )
+HB_FUNC( __CLASSSEL )
 {
    USHORT uiClass = hb_parni( 1 );
    PHB_ITEM pReturn = hb_itemNew( NULL );
@@ -1248,7 +1248,7 @@ static HARBOUR hb___msgVirtual( void )
 }
 
 /* to be used from Classes ERROR HANDLER method */
-HARBOUR HB___GETMESSAGE()
+HB_FUNC( __GETMESSAGE )
 {
    PHB_ITEM pBase = hb_stack.pBase;
 
@@ -1256,3 +1256,4 @@ HARBOUR HB___GETMESSAGE()
 
    hb_retc( pBase->item.asSymbol.value->szName );
 }
+
diff --git a/harbour/source/vm/cmdarg.c b/harbour/source/vm/cmdarg.c
index 441161247f..09222eb454 100644
--- a/harbour/source/vm/cmdarg.c
+++ b/harbour/source/vm/cmdarg.c
@@ -203,14 +203,14 @@ int hb_cmdargNum( const char * pszName )
 
 /* Check if an internal switch has been set */
 
-HARBOUR HB_HB_ARGCHECK( void )
+HB_FUNC( HB_ARGCHECK )
 {
    hb_retl( ISCHAR( 1 ) ? hb_cmdargCheck( hb_parc( 1 ) ) : FALSE );
 }
 
 /* Returns the value of an internal switch */
 
-HARBOUR HB_HB_ARGSTRING( void )
+HB_FUNC( HB_ARGSTRING )
 {
    if( ISCHAR( 1 ) )
    {
@@ -229,7 +229,7 @@ HARBOUR HB_HB_ARGSTRING( void )
 /* Returns the number of command line arguments passed to the application, this
    also includes the internal arguments. */
 
-HARBOUR HB_HB_ARGC( void )
+HB_FUNC( HB_ARGC )
 {
    hb_retni( s_argc - 1 );
 }
@@ -238,7 +238,7 @@ HARBOUR HB_HB_ARGC( void )
    the parameter zero, it will return the name of the executable, as written
    in the command line. */
 
-HARBOUR HB_HB_ARGV( void )
+HB_FUNC( HB_ARGV )
 {
    if( ISNUM( 1 ) )
    {
diff --git a/harbour/source/vm/debug.c b/harbour/source/vm/debug.c
index 97bfa0c6b3..564778e74d 100644
--- a/harbour/source/vm/debug.c
+++ b/harbour/source/vm/debug.c
@@ -78,7 +78,7 @@ static USHORT hb_stackLenGlobal( void )
    return uiCount;
 }
 
-HARBOUR HB___VMSTKGCOUNT( void )
+HB_FUNC( __VMSTKGCOUNT )
 {
    hb_retni( hb_stackLenGlobal() );
 }
@@ -87,7 +87,7 @@ HARBOUR HB___VMSTKGCOUNT( void )
  * $FuncName$     <aStack> __vmStkGList()
  * $Description$  Returns the global stack
  * $End$ */
-HARBOUR HB___VMSTKGLIST( void )
+HB_FUNC( __VMSTKGLIST )
 {
    PHB_ITEM pReturn;
    PHB_ITEM pItem;
@@ -121,7 +121,7 @@ static USHORT StackLen( void )
 
    return uiCount;
 }
-HARBOUR HB___VMSTKLCOUNT( void )
+HB_FUNC( __VMSTKLCOUNT )
 {
    hb_retni( StackLen() );
 }
@@ -137,7 +137,7 @@ HARBOUR HB___VMSTKLCOUNT( void )
  *                [x+1 .. y] Locals
  *                [y+1 ..]   Pushed data
  * $End$ */
-HARBOUR HB___VMSTKLLIST( void )
+HB_FUNC( __VMSTKLLIST )
 {
    PHB_ITEM pReturn;
    PHB_ITEM pItem;
@@ -160,7 +160,7 @@ HARBOUR HB___VMSTKLLIST( void )
                /* TODO : put bLocals / bParams      */
                /* somewhere for declared parameters */
                /* and locals                        */
-HARBOUR HB___VMPARLLIST( void )
+HB_FUNC( __VMPARLLIST )
 {
    PHB_ITEM pReturn;
    PHB_ITEM pItem;
@@ -178,7 +178,7 @@ HARBOUR HB___VMPARLLIST( void )
    hb_itemRelease( pReturn );
 }
 
-HARBOUR HB___VMVARLGET( void )
+HB_FUNC( __VMVARLGET )
 {
    int iLevel = hb_parni( 1 ) + 1;
    PHB_ITEM pBase = hb_stack.pBase;
diff --git a/harbour/source/vm/dynsym.c b/harbour/source/vm/dynsym.c
index 099efa2217..f838505cbc 100644
--- a/harbour/source/vm/dynsym.c
+++ b/harbour/source/vm/dynsym.c
@@ -85,7 +85,7 @@ PHB_DYNS hb_dynsymNew( PHB_SYMB pSymbol )    /* creates a new dynamic symbol */
    pDynSym = hb_dynsymFind( pSymbol->szName ); /* Find position */
    if( pDynSym )            /* If name exists */
    {
-      if( ! ( pSymbol->cScope & ( _HB_FS_STATIC | _HB_FS_INIT | _HB_FS_EXIT ) ) ) /* only for _HB_FS_PUBLIC */
+      if( ! ( pSymbol->cScope & ( HB_FS_STATIC | HB_FS_INIT | HB_FS_EXIT ) ) ) /* only for HB_FS_PUBLIC */
       {
          if( ( ! pDynSym->pFunPtr ) && pSymbol->pFunPtr ) /* The DynSym existed */
             pDynSym->pFunPtr = pSymbol->pFunPtr;  /* but had no function ptr assigned */
@@ -118,7 +118,7 @@ PHB_DYNS hb_dynsymNew( PHB_SYMB pSymbol )    /* creates a new dynamic symbol */
    pDynSym->hMemvar = 0;
    pDynSym->hArea   = 0;
 
-   if( ! ( pSymbol->cScope & ( _HB_FS_STATIC | _HB_FS_INIT | _HB_FS_EXIT ) ) ) /* only for _HB_FS_PUBLIC */
+   if( ! ( pSymbol->cScope & ( HB_FS_STATIC | HB_FS_INIT | HB_FS_EXIT ) ) ) /* only for HB_FS_PUBLIC */
    {
       if( pDynSym->pFunPtr != pSymbol->pFunPtr ) /* it contains a function pointer */
          pDynSym->pFunPtr = pSymbol->pFunPtr;    /* place the function at DynSym */
@@ -285,12 +285,12 @@ void hb_dynsymRelease( void )
    hb_xfree( s_pDynItems );
 }
 
-HARBOUR HB___DYNSCOUNT( void ) /* How much symbols do we have: dsCount = __dynsymCount() */
+HB_FUNC( __DYNSCOUNT ) /* How much symbols do we have: dsCount = __dynsymCount() */
 {
    hb_retnl( ( long ) s_uiDynSymbols );
 }
 
-HARBOUR HB___DYNSGETNAME( void ) /* Get name of symbol: cSymbol = __dynsymGetName( dsIndex ) */
+HB_FUNC( __DYNSGETNAME ) /* Get name of symbol: cSymbol = __dynsymGetName( dsIndex ) */
 {
    long lIndex = hb_parnl( 1 ); /* NOTE: This will return zero if the parameter is not numeric */
 
@@ -300,7 +300,7 @@ HARBOUR HB___DYNSGETNAME( void ) /* Get name of symbol: cSymbol = __dynsymGetNam
       hb_retc( "" );
 }
 
-HARBOUR HB___DYNSGETINDEX( void ) /* Gimme index number of symbol: dsIndex = __dynsymGetIndex( cSymbol ) */
+HB_FUNC( __DYNSGETINDEX ) /* Gimme index number of symbol: dsIndex = __dynsymGetIndex( cSymbol ) */
 {
    PHB_DYNS pDynSym = hb_dynsymFindName( hb_parc( 1 ) );
 
diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c
index 21ce827501..0db47f510c 100644
--- a/harbour/source/vm/fm.c
+++ b/harbour/source/vm/fm.c
@@ -621,7 +621,7 @@ ULONG hb_xquery( USHORT uiMode )
    return ulResult;
 }
 
-HARBOUR HB_MEMORY( void )
+HB_FUNC( MEMORY )
 {
    hb_retnl( hb_xquery( hb_parni( 1 ) ) );
 }
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index df42a4144d..4b689c94a5 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -38,8 +38,8 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Eddie Runia <eddie@runia.com>
- *    HB___VMVARSGET()
- *    HB___VMVARSLIST()
+ *    __VMVARSGET()
+ *    __VMVARSLIST()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -68,7 +68,7 @@ typedef struct _SYMBOLS
    HB_SYMBOLSCOPE hScope;    /* scope collected from all symbols in module used to speed initialization code */
 } SYMBOLS, * PSYMBOLS;       /* structure to keep track of all modules symbol tables */
 
-extern HARBOUR HB_SYSINIT( void );
+extern HB_FUNC( SYSINIT );
 
 /* PCode functions */
 
@@ -199,7 +199,7 @@ extern POBJSYMBOLS HB_FIRSTSYMBOL, HB_LASTSYMBOL;
 /* virtual machine state */
 
 HB_STACK hb_stack;
-HB_SYMB  hb_symEval = { "__EVAL", _HB_FS_PUBLIC, hb_vmDoBlock, NULL }; /* symbol to evaluate codeblocks */
+HB_SYMB  hb_symEval = { "__EVAL", HB_FS_PUBLIC, hb_vmDoBlock, NULL }; /* symbol to evaluate codeblocks */
 
 static HB_ITEM  s_aStatics;         /* Harbour array to hold all application statics variables */
 static PHB_SYMB s_pSymStart = NULL; /* start symbol of the application. MAIN() is not required */
@@ -286,7 +286,7 @@ void hb_vmInit( BOOL bStartMainProc )
       int i;
       int iArgCount;
 
-      hb_vmPushSymbol( s_pSymStart ); /* pushes first _HB_FS_PUBLIC defined symbol to the stack */
+      hb_vmPushSymbol( s_pSymStart ); /* pushes first HB_FS_PUBLIC defined symbol to the stack */
       hb_vmPushNil();                 /* places NIL at self */
 
       iArgCount = 0;
@@ -2677,7 +2677,7 @@ static void hb_vmSFrame( PHB_SYMB pSym )      /* sets the statics frame for a fu
    HB_TRACE(HB_TR_DEBUG, ("hb_vmSFrame(%p)", pSym));
 
    /* _INITSTATICS is now the statics frame. Statics() changed it! */
-   hb_stack.iStatics = ( int ) pSym->pFunPtr; /* pSym is { "$_INITSTATICS", _HB_FS_INIT | _HB_FS_EXIT, _INITSTATICS } for each PRG */
+   hb_stack.iStatics = ( int ) pSym->pFunPtr; /* pSym is { "$_INITSTATICS", HB_FS_INIT | HB_FS_EXIT, _INITSTATICS } for each PRG */
 }
 
 static void hb_vmStatics( PHB_SYMB pSym, USHORT uiStatics ) /* initializes the global aStatics array or redimensionates it */
@@ -3580,10 +3580,10 @@ void hb_vmProcessSymbols( PHB_SYMB pModuleSymbols, USHORT uiModuleSymbols ) /* m
 
       hSymScope = ( pModuleSymbols + ui )->cScope;
       pNewSymbols->hScope |= hSymScope;
-      if( ( ! s_pSymStart ) && ( hSymScope == _HB_FS_PUBLIC ) )
+      if( ( ! s_pSymStart ) && ( hSymScope == HB_FS_PUBLIC ) )
          s_pSymStart = pModuleSymbols + ui;  /* first public defined symbol to start execution */
 
-      if( ( hSymScope == _HB_FS_PUBLIC ) || ( hSymScope & ( _HB_FS_MESSAGE | _HB_FS_MEMVAR ) ) )
+      if( ( hSymScope == HB_FS_PUBLIC ) || ( hSymScope & ( HB_FS_MESSAGE | HB_FS_MEMVAR ) ) )
          hb_dynsymNew( pModuleSymbols + ui );
    }
 }
@@ -3625,7 +3625,7 @@ static void hb_vmReleaseLocalSymbols( void )
 }
 
 /* This calls all _INITSTATICS functions defined in the application.
- * We are using a special symbol's scope ( _HB_FS_INIT | _HB_FS_EXIT ) to mark
+ * We are using a special symbol's scope ( HB_FS_INIT | HB_FS_EXIT ) to mark
  * this function. These two bits cannot be marked at the same
  * time for normal user defined functions.
  */
@@ -3637,15 +3637,15 @@ static void hb_vmDoInitStatics( void )
 
    do
    {
-      if( ( pLastSymbols->hScope & ( _HB_FS_INIT | _HB_FS_EXIT ) ) == ( _HB_FS_INIT | _HB_FS_EXIT ) )
+      if( ( pLastSymbols->hScope & ( HB_FS_INIT | HB_FS_EXIT ) ) == ( HB_FS_INIT | HB_FS_EXIT ) )
       {
          USHORT ui;
 
          for( ui = 0; ui < pLastSymbols->uiModuleSymbols; ui++ )
          {
-            HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->cScope & ( _HB_FS_EXIT | _HB_FS_INIT );
+            HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->cScope & ( HB_FS_EXIT | HB_FS_INIT );
 
-            if( scope == ( _HB_FS_INIT | _HB_FS_EXIT ) )
+            if( scope == ( HB_FS_INIT | HB_FS_EXIT ) )
             {
                hb_vmPushSymbol( pLastSymbols->pModuleSymbols + ui );
                hb_vmPushNil();
@@ -3667,15 +3667,15 @@ static void hb_vmDoExitFunctions( void )
    do
    {
       /* only if module contains some EXIT functions */
-      if( pLastSymbols->hScope & _HB_FS_EXIT )
+      if( pLastSymbols->hScope & HB_FS_EXIT )
       {
          USHORT ui;
 
          for( ui = 0; ui < pLastSymbols->uiModuleSymbols; ui++ )
          {
-            HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->cScope & ( _HB_FS_EXIT | _HB_FS_INIT );
+            HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->cScope & ( HB_FS_EXIT | HB_FS_INIT );
 
-            if( scope == _HB_FS_EXIT )
+            if( scope == HB_FS_EXIT )
             {
                hb_vmPushSymbol( pLastSymbols->pModuleSymbols + ui );
                hb_vmPushNil();
@@ -3701,15 +3701,15 @@ static void hb_vmDoInitFunctions( void )
    do
    {
       /* only if module contains some INIT functions */
-      if( pLastSymbols->hScope & _HB_FS_INIT )
+      if( pLastSymbols->hScope & HB_FS_INIT )
       {
          USHORT ui;
 
          for( ui = 0; ui < pLastSymbols->uiModuleSymbols; ui++ )
          {
-            HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->cScope & ( _HB_FS_EXIT | _HB_FS_INIT );
+            HB_SYMBOLSCOPE scope = ( pLastSymbols->pModuleSymbols + ui )->cScope & ( HB_FS_EXIT | HB_FS_INIT );
 
-            if( scope == _HB_FS_INIT )
+            if( scope == HB_FS_INIT )
             {
                int argc = hb_cmdargARGC();
                char ** argv = hb_cmdargARGV();
@@ -3747,12 +3747,12 @@ void hb_vmForceLink( void )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_vmForceLink()"));
 
-   HB_SYSINIT();
+   HB_FUNCNAME( SYSINIT )();
 }
 
 /* ----------------------------- */
 
-HARBOUR HB_ERRORLEVEL( void )
+HB_FUNC( ERRORLEVEL )
 {
    hb_retni( s_byErrorLevel );
 
@@ -3819,7 +3819,7 @@ void hb_vmRequestCancel( void )
  * $FuncName$     <aStat> __vmVarSList()
  * $Description$  Return the statics array. Please aClone before assignments
  * $End$ */
-HARBOUR HB___VMVARSLIST( void )
+HB_FUNC( __VMVARSLIST )
 {
    PHB_ITEM pStatics = hb_arrayClone( &s_aStatics );
 
@@ -3831,7 +3831,7 @@ HARBOUR HB___VMVARSLIST( void )
  * $FuncName$     <xStat> __vmVarSGet(<nStatic>)
  * $Description$  Return a specified statics
  * $End$ */
-HARBOUR HB___VMVARSGET( void )
+HB_FUNC( __VMVARSGET )
 {
    hb_itemReturn( s_aStatics.item.asArray.value->pItems +
                   hb_stack.iStatics + hb_parni( 1 ) - 1 );
diff --git a/harbour/source/vm/initexit.c b/harbour/source/vm/initexit.c
index 65b497bb7c..6816e7f27b 100644
--- a/harbour/source/vm/initexit.c
+++ b/harbour/source/vm/initexit.c
@@ -36,7 +36,7 @@
 #include "hbapi.h"
 #include "hbvm.h"
 
-HARBOUR HB___QUIT( void )
+HB_FUNC( __QUIT )
 {
    hb_vmRequestQuit();
 }
diff --git a/harbour/source/vm/initsymb.c b/harbour/source/vm/initsymb.c
index 6b34e10f46..85b6c822b3 100644
--- a/harbour/source/vm/initsymb.c
+++ b/harbour/source/vm/initsymb.c
@@ -36,138 +36,136 @@
 #include "hbapi.h"
 #include "hbvm.h"
 
-extern HARBOUR HB_AADD( void );
-extern HARBOUR HB_ABS( void );
-extern HARBOUR HB_ASC( void );
-extern HARBOUR HB_AT( void );
-extern HARBOUR HB_BOF( void );
-extern HARBOUR HB_BREAK( void );
-extern HARBOUR HB_CDOW( void );
-extern HARBOUR HB_CHR( void );
-extern HARBOUR HB_CMONTH( void );
-extern HARBOUR HB_COL( void );
-extern HARBOUR HB_CTOD( void );
-extern HARBOUR HB_DATE( void );
-extern HARBOUR HB_DAY( void );
-extern HARBOUR HB_DELETED( void );
-extern HARBOUR HB_DEVPOS( void );
-extern HARBOUR HB_DOW( void );
-extern HARBOUR HB_DTOC( void );
-extern HARBOUR HB_DTOS( void );
-extern HARBOUR HB_EMPTY( void );
-extern HARBOUR HB_EOF( void );
-extern HARBOUR HB_EXP( void );
-extern HARBOUR HB_FCOUNT( void );
-extern HARBOUR HB_FIELDNAME( void );
-extern HARBOUR HB_FLOCK( void );
-extern HARBOUR HB_FOUND( void );
-extern HARBOUR HB_INKEY( void );
-extern HARBOUR HB_INT( void );
-extern HARBOUR HB_LASTREC( void );
-extern HARBOUR HB_LEFT( void );
-extern HARBOUR HB_LEN( void );
-extern HARBOUR HB_LOCK( void );
-extern HARBOUR HB_LOG( void );
-extern HARBOUR HB_LOWER( void );
-extern HARBOUR HB_LTRIM( void );
-extern HARBOUR HB_MAX( void );
-extern HARBOUR HB_MIN( void );
-extern HARBOUR HB_MONTH( void );
-extern HARBOUR HB_PCOL( void );
-extern HARBOUR HB_PCOUNT( void );
-extern HARBOUR HB_PROW( void );
-extern HARBOUR HB_RECCOUNT( void );
-extern HARBOUR HB_RECNO( void );
-extern HARBOUR HB_REPLICATE( void );
-extern HARBOUR HB_RLOCK( void );
-extern HARBOUR HB_ROUND( void );
-extern HARBOUR HB_ROW( void );
-extern HARBOUR HB_RTRIM( void );
-extern HARBOUR HB_SECONDS( void );
-extern HARBOUR HB_SELECT( void );
-extern HARBOUR HB_SETPOS( void );
-extern HARBOUR HB_SETPOSBS( void );
-extern HARBOUR HB_SPACE( void );
-extern HARBOUR HB_SQRT( void );
-extern HARBOUR HB_STR( void );
-extern HARBOUR HB_SUBSTR( void );
-extern HARBOUR HB_TIME( void );
-extern HARBOUR HB_TRANSFORM( void );
-extern HARBOUR HB_TRIM( void );
-extern HARBOUR HB_TYPE( void );
-extern HARBOUR HB_UPPER( void );
-extern HARBOUR HB_VAL( void );
-extern HARBOUR HB_WORD( void );
-extern HARBOUR HB_YEAR( void );
+extern HB_FUNC( AADD );
+extern HB_FUNC( ABS );
+extern HB_FUNC( ASC );
+extern HB_FUNC( AT );
+extern HB_FUNC( BOF );
+extern HB_FUNC( BREAK );
+extern HB_FUNC( CDOW );
+extern HB_FUNC( CHR );
+extern HB_FUNC( CMONTH );
+extern HB_FUNC( COL );
+extern HB_FUNC( CTOD );
+extern HB_FUNC( DATE );
+extern HB_FUNC( DAY );
+extern HB_FUNC( DELETED );
+extern HB_FUNC( DEVPOS );
+extern HB_FUNC( DOW );
+extern HB_FUNC( DTOC );
+extern HB_FUNC( DTOS );
+extern HB_FUNC( EMPTY );
+extern HB_FUNC( EOF );
+extern HB_FUNC( EXP );
+extern HB_FUNC( FCOUNT );
+extern HB_FUNC( FIELDNAME );
+extern HB_FUNC( FLOCK );
+extern HB_FUNC( FOUND );
+extern HB_FUNC( INKEY );
+extern HB_FUNC( INT );
+extern HB_FUNC( LASTREC );
+extern HB_FUNC( LEFT );
+extern HB_FUNC( LEN );
+extern HB_FUNC( LOCK );
+extern HB_FUNC( LOG );
+extern HB_FUNC( LOWER );
+extern HB_FUNC( LTRIM );
+extern HB_FUNC( MAX );
+extern HB_FUNC( MIN );
+extern HB_FUNC( MONTH );
+extern HB_FUNC( PCOL );
+extern HB_FUNC( PCOUNT );
+extern HB_FUNC( PROW );
+extern HB_FUNC( RECCOUNT );
+extern HB_FUNC( RECNO );
+extern HB_FUNC( REPLICATE );
+extern HB_FUNC( RLOCK );
+extern HB_FUNC( ROUND );
+extern HB_FUNC( ROW );
+extern HB_FUNC( RTRIM );
+extern HB_FUNC( SECONDS );
+extern HB_FUNC( SELECT );
+extern HB_FUNC( SETPOS );
+extern HB_FUNC( SETPOSBS );
+extern HB_FUNC( SPACE );
+extern HB_FUNC( SQRT );
+extern HB_FUNC( STR );
+extern HB_FUNC( SUBSTR );
+extern HB_FUNC( TIME );
+extern HB_FUNC( TRANSFORM );
+extern HB_FUNC( TRIM );
+extern HB_FUNC( TYPE );
+extern HB_FUNC( UPPER );
+extern HB_FUNC( VAL );
+extern HB_FUNC( WORD );
+extern HB_FUNC( YEAR );
 
 static HB_SYMB symbols[] = {
-   { "AADD"      , _HB_FS_PUBLIC, HB_AADD         , 0 },
-   { "ABS"       , _HB_FS_PUBLIC, HB_ABS          , 0 },
-   { "ASC"       , _HB_FS_PUBLIC, HB_ASC          , 0 },
-   { "AT"        , _HB_FS_PUBLIC, HB_AT           , 0 },
-   { "BOF"       , _HB_FS_PUBLIC, HB_BOF          , 0 },
-   { "BREAK"     , _HB_FS_PUBLIC, HB_BREAK        , 0 },
-   { "CDOW"      , _HB_FS_PUBLIC, HB_CDOW         , 0 },
-   { "CHR"       , _HB_FS_PUBLIC, HB_CHR          , 0 },
-   { "CMONTH"    , _HB_FS_PUBLIC, HB_CMONTH       , 0 },
-   { "COL"       , _HB_FS_PUBLIC, HB_COL          , 0 },
-   { "CTOD"      , _HB_FS_PUBLIC, HB_CTOD         , 0 },
-   { "DATE"      , _HB_FS_PUBLIC, HB_DATE         , 0 },
-   { "DAY"       , _HB_FS_PUBLIC, HB_DAY          , 0 },
-   { "DELETED"   , _HB_FS_PUBLIC, HB_DELETED      , 0 },
-   { "DEVPOS"    , _HB_FS_PUBLIC, HB_DEVPOS       , 0 },
-   { "DOW"       , _HB_FS_PUBLIC, HB_DOW          , 0 },
-   { "DTOC"      , _HB_FS_PUBLIC, HB_DTOC         , 0 },
-   { "DTOS"      , _HB_FS_PUBLIC, HB_DTOS         , 0 },
-   { "EMPTY"     , _HB_FS_PUBLIC, HB_EMPTY        , 0 },
-   { "EOF"       , _HB_FS_PUBLIC, HB_EOF          , 0 },
-   { "EXP"       , _HB_FS_PUBLIC, HB_EXP          , 0 },
-   { "FCOUNT"    , _HB_FS_PUBLIC, HB_FCOUNT       , 0 },
-   { "FIELDNAME" , _HB_FS_PUBLIC, HB_FIELDNAME    , 0 },
-   { "FLOCK"     , _HB_FS_PUBLIC, HB_FLOCK        , 0 },
-   { "FOUND"     , _HB_FS_PUBLIC, HB_FOUND        , 0 },
-   { "INKEY"     , _HB_FS_PUBLIC, HB_INKEY        , 0 },
-   { "INT"       , _HB_FS_PUBLIC, HB_INT          , 0 },
-   { "LASTREC"   , _HB_FS_PUBLIC, HB_LASTREC      , 0 },
-   { "LEFT"      , _HB_FS_PUBLIC, HB_LEFT         , 0 },
-   { "LEN"       , _HB_FS_PUBLIC, HB_LEN          , 0 },
-   { "LOCK"      , _HB_FS_PUBLIC, HB_LOCK         , 0 },
-   { "LOG"       , _HB_FS_PUBLIC, HB_LOG          , 0 },
-   { "LOWER"     , _HB_FS_PUBLIC, HB_LOWER        , 0 },
-   { "LTRIM"     , _HB_FS_PUBLIC, HB_LTRIM        , 0 },
-   { "MAX"       , _HB_FS_PUBLIC, HB_MAX          , 0 },
-   { "MIN"       , _HB_FS_PUBLIC, HB_MIN          , 0 },
-   { "MONTH"     , _HB_FS_PUBLIC, HB_MONTH        , 0 },
-   { "PCOL"      , _HB_FS_PUBLIC, HB_PCOL         , 0 },
-   { "PCOUNT"    , _HB_FS_PUBLIC, HB_PCOUNT       , 0 },
-   { "PROW"      , _HB_FS_PUBLIC, HB_PROW         , 0 },
-   { "RECCOUNT"  , _HB_FS_PUBLIC, HB_RECCOUNT     , 0 },
-   { "RECNO"     , _HB_FS_PUBLIC, HB_RECNO        , 0 },
-   { "REPLICATE" , _HB_FS_PUBLIC, HB_REPLICATE    , 0 },
-   { "RLOCK"     , _HB_FS_PUBLIC, HB_RLOCK        , 0 },
-   { "ROUND"     , _HB_FS_PUBLIC, HB_ROUND        , 0 },
-   { "ROW"       , _HB_FS_PUBLIC, HB_ROW          , 0 },
-   { "RTRIM"     , _HB_FS_PUBLIC, HB_RTRIM        , 0 },
-   { "SECONDS"   , _HB_FS_PUBLIC, HB_SECONDS      , 0 },
-   { "SELECT"    , _HB_FS_PUBLIC, HB_SELECT       , 0 },
-   { "SETPOS"    , _HB_FS_PUBLIC, HB_SETPOS       , 0 },
-   { "SETPOSBS"  , _HB_FS_PUBLIC, HB_SETPOSBS     , 0 },
-   { "SPACE"     , _HB_FS_PUBLIC, HB_SPACE        , 0 },
-   { "SQRT"      , _HB_FS_PUBLIC, HB_SQRT         , 0 },
-   { "STR"       , _HB_FS_PUBLIC, HB_STR          , 0 },
-   { "SUBSTR"    , _HB_FS_PUBLIC, HB_SUBSTR       , 0 },
-   { "TIME"      , _HB_FS_PUBLIC, HB_TIME         , 0 },
-   { "TRANSFORM" , _HB_FS_PUBLIC, HB_TRANSFORM    , 0 },
-   { "TRIM"      , _HB_FS_PUBLIC, HB_TRIM         , 0 },
-   { "TYPE"      , _HB_FS_PUBLIC, HB_TYPE         , 0 },
-   { "UPPER"     , _HB_FS_PUBLIC, HB_UPPER        , 0 },
-   { "VAL"       , _HB_FS_PUBLIC, HB_VAL          , 0 },
-   { "WORD"      , _HB_FS_PUBLIC, HB_WORD         , 0 },
-   { "YEAR"      , _HB_FS_PUBLIC, HB_YEAR         , 0 }
+   { "AADD"      , HB_FS_PUBLIC, HB_FUNCNAME( AADD )       , NULL },
+   { "ABS"       , HB_FS_PUBLIC, HB_FUNCNAME( ABS )        , NULL },
+   { "ASC"       , HB_FS_PUBLIC, HB_FUNCNAME( ASC )        , NULL },
+   { "AT"        , HB_FS_PUBLIC, HB_FUNCNAME( AT )         , NULL },
+   { "BOF"       , HB_FS_PUBLIC, HB_FUNCNAME( BOF )        , NULL },
+   { "BREAK"     , HB_FS_PUBLIC, HB_FUNCNAME( BREAK )      , NULL },
+   { "CDOW"      , HB_FS_PUBLIC, HB_FUNCNAME( CDOW )       , NULL },
+   { "CHR"       , HB_FS_PUBLIC, HB_FUNCNAME( CHR )        , NULL },
+   { "CMONTH"    , HB_FS_PUBLIC, HB_FUNCNAME( CMONTH )     , NULL },
+   { "COL"       , HB_FS_PUBLIC, HB_FUNCNAME( COL )        , NULL },
+   { "CTOD"      , HB_FS_PUBLIC, HB_FUNCNAME( CTOD )       , NULL },
+   { "DATE"      , HB_FS_PUBLIC, HB_FUNCNAME( DATE )       , NULL },
+   { "DAY"       , HB_FS_PUBLIC, HB_FUNCNAME( DAY )        , NULL },
+   { "DELETED"   , HB_FS_PUBLIC, HB_FUNCNAME( DELETED )    , NULL },
+   { "DEVPOS"    , HB_FS_PUBLIC, HB_FUNCNAME( DEVPOS )     , NULL },
+   { "DOW"       , HB_FS_PUBLIC, HB_FUNCNAME( DOW )        , NULL },
+   { "DTOC"      , HB_FS_PUBLIC, HB_FUNCNAME( DTOC )       , NULL },
+   { "DTOS"      , HB_FS_PUBLIC, HB_FUNCNAME( DTOS )       , NULL },
+   { "EMPTY"     , HB_FS_PUBLIC, HB_FUNCNAME( EMPTY )      , NULL },
+   { "EOF"       , HB_FS_PUBLIC, HB_FUNCNAME( EOF )        , NULL },
+   { "EXP"       , HB_FS_PUBLIC, HB_FUNCNAME( EXP )        , NULL },
+   { "FCOUNT"    , HB_FS_PUBLIC, HB_FUNCNAME( FCOUNT )     , NULL },
+   { "FIELDNAME" , HB_FS_PUBLIC, HB_FUNCNAME( FIELDNAME )  , NULL },
+   { "FLOCK"     , HB_FS_PUBLIC, HB_FUNCNAME( FLOCK )      , NULL },
+   { "FOUND"     , HB_FS_PUBLIC, HB_FUNCNAME( FOUND )      , NULL },
+   { "INKEY"     , HB_FS_PUBLIC, HB_FUNCNAME( INKEY )      , NULL },
+   { "INT"       , HB_FS_PUBLIC, HB_FUNCNAME( INT )        , NULL },
+   { "LASTREC"   , HB_FS_PUBLIC, HB_FUNCNAME( LASTREC )    , NULL },
+   { "LEFT"      , HB_FS_PUBLIC, HB_FUNCNAME( LEFT )       , NULL },
+   { "LEN"       , HB_FS_PUBLIC, HB_FUNCNAME( LEN )        , NULL },
+   { "LOCK"      , HB_FS_PUBLIC, HB_FUNCNAME( LOCK )       , NULL },
+   { "LOG"       , HB_FS_PUBLIC, HB_FUNCNAME( LOG )        , NULL },
+   { "LOWER"     , HB_FS_PUBLIC, HB_FUNCNAME( LOWER )      , NULL },
+   { "LTRIM"     , HB_FS_PUBLIC, HB_FUNCNAME( LTRIM )      , NULL },
+   { "MAX"       , HB_FS_PUBLIC, HB_FUNCNAME( MAX )        , NULL },
+   { "MIN"       , HB_FS_PUBLIC, HB_FUNCNAME( MIN )        , NULL },
+   { "MONTH"     , HB_FS_PUBLIC, HB_FUNCNAME( MONTH )      , NULL },
+   { "PCOL"      , HB_FS_PUBLIC, HB_FUNCNAME( PCOL )       , NULL },
+   { "PCOUNT"    , HB_FS_PUBLIC, HB_FUNCNAME( PCOUNT )     , NULL },
+   { "PROW"      , HB_FS_PUBLIC, HB_FUNCNAME( PROW )       , NULL },
+   { "RECCOUNT"  , HB_FS_PUBLIC, HB_FUNCNAME( RECCOUNT )   , NULL },
+   { "RECNO"     , HB_FS_PUBLIC, HB_FUNCNAME( RECNO )      , NULL },
+   { "REPLICATE" , HB_FS_PUBLIC, HB_FUNCNAME( REPLICATE )  , NULL },
+   { "RLOCK"     , HB_FS_PUBLIC, HB_FUNCNAME( RLOCK )      , NULL },
+   { "ROUND"     , HB_FS_PUBLIC, HB_FUNCNAME( ROUND )      , NULL },
+   { "ROW"       , HB_FS_PUBLIC, HB_FUNCNAME( ROW )        , NULL },
+   { "RTRIM"     , HB_FS_PUBLIC, HB_FUNCNAME( RTRIM )      , NULL },
+   { "SECONDS"   , HB_FS_PUBLIC, HB_FUNCNAME( SECONDS )    , NULL },
+   { "SELECT"    , HB_FS_PUBLIC, HB_FUNCNAME( SELECT )     , NULL },
+   { "SETPOS"    , HB_FS_PUBLIC, HB_FUNCNAME( SETPOS )     , NULL },
+   { "SETPOSBS"  , HB_FS_PUBLIC, HB_FUNCNAME( SETPOSBS )   , NULL },
+   { "SPACE"     , HB_FS_PUBLIC, HB_FUNCNAME( SPACE )      , NULL },
+   { "SQRT"      , HB_FS_PUBLIC, HB_FUNCNAME( SQRT )       , NULL },
+   { "STR"       , HB_FS_PUBLIC, HB_FUNCNAME( STR )        , NULL },
+   { "SUBSTR"    , HB_FS_PUBLIC, HB_FUNCNAME( SUBSTR )     , NULL },
+   { "TIME"      , HB_FS_PUBLIC, HB_FUNCNAME( TIME )       , NULL },
+   { "TRANSFORM" , HB_FS_PUBLIC, HB_FUNCNAME( TRANSFORM )  , NULL },
+   { "TRIM"      , HB_FS_PUBLIC, HB_FUNCNAME( TRIM )       , NULL },
+   { "TYPE"      , HB_FS_PUBLIC, HB_FUNCNAME( TYPE )       , NULL },
+   { "UPPER"     , HB_FS_PUBLIC, HB_FUNCNAME( UPPER )      , NULL },
+   { "VAL"       , HB_FS_PUBLIC, HB_FUNCNAME( VAL )        , NULL },
+   { "WORD"      , HB_FS_PUBLIC, HB_FUNCNAME( WORD )       , NULL },
+   { "YEAR"      , HB_FS_PUBLIC, HB_FUNCNAME( YEAR )       , NULL }
 };
 
-/* Registers runtime support functions symbols */
-
 /* NOTE: The system symbol table with runtime functions HAVE TO be called
          last */
 
diff --git a/harbour/source/vm/memvars.c b/harbour/source/vm/memvars.c
index f232e8b344..272471e8b6 100644
--- a/harbour/source/vm/memvars.c
+++ b/harbour/source/vm/memvars.c
@@ -38,12 +38,12 @@
  * www - http://www.harbour-project.org
  *
  * Copyright 1999 Victor Szakats <info@szelvesz.hu>
- *    HB___MVSAVE()
- *    HB___MVRESTORE() (Thanks to Dave Pearson and Jo French for the original
- *                      Clipper function (FReadMem()) to read .MEM files)
- *    HB___MSAVE()
- *    HB___MRESTORE()
- *    HB___QQPUB()
+ *    __MVSAVE()
+ *    __MVRESTORE() (Thanks to Dave Pearson and Jo French for the original
+ *                   Clipper function (FReadMem()) to read .MEM files)
+ *    __MSAVE()
+ *    __MRESTORE()
+ *    __QQPUB()
  *
  * See doc/license.txt for licensing terms.
  *
@@ -906,7 +906,7 @@ static HB_DYNS_PTR hb_memvarFindSymbol( HB_ITEM_PTR pName )
 
 /* ************************************************************************** */
 
-HARBOUR HB___MVPUBLIC( void )
+HB_FUNC( __MVPUBLIC )
 {
    int iCount = hb_pcount();
 
@@ -943,7 +943,7 @@ HARBOUR HB___MVPUBLIC( void )
 
 /* NOTE: Undocumented Clipper internal function */
 
-HARBOUR HB___QQPUB( void )
+HB_FUNC( __QQPUB )
 {
    PHB_ITEM pItem = hb_param( 1, IT_STRING );
 
@@ -951,7 +951,7 @@ HARBOUR HB___QQPUB( void )
       hb_memvarCreateFromItem( pItem, VS_PUBLIC, NULL );
 }
 
-HARBOUR HB___MVPRIVATE( void )
+HB_FUNC( __MVPRIVATE )
 {
    int iCount = hb_pcount();
 
@@ -986,7 +986,7 @@ HARBOUR HB___MVPRIVATE( void )
    }
 }
 
-HARBOUR HB___MVXRELEASE( void )
+HB_FUNC( __MVXRELEASE )
 {
    int iCount = hb_pcount();
 
@@ -1021,7 +1021,7 @@ HARBOUR HB___MVXRELEASE( void )
    }
 }
 
-HARBOUR HB___MVRELEASE( void )
+HB_FUNC( __MVRELEASE )
 {
    int iCount = hb_pcount();
 
@@ -1045,7 +1045,7 @@ HARBOUR HB___MVRELEASE( void )
    }
 }
 
-HARBOUR HB___MVSCOPE( void )
+HB_FUNC( __MVSCOPE )
 {
    int iMemvar = HB_MV_ERROR;
 
@@ -1060,12 +1060,12 @@ HARBOUR HB___MVSCOPE( void )
    hb_retni( iMemvar );
 }
 
-HARBOUR HB___MVCLEAR( void )
+HB_FUNC( __MVCLEAR )
 {
    hb_dynsymEval( hb_memvarClear, NULL );
 }
 
-HARBOUR HB___MVDBGINFO( void )
+HB_FUNC( __MVDBGINFO )
 {
    int iCount = hb_pcount();
 
@@ -1116,7 +1116,7 @@ HARBOUR HB___MVDBGINFO( void )
    }
 }
 
-HARBOUR HB___MVGET( void )
+HB_FUNC( __MVGET )
 {
    HB_ITEM_PTR pName = hb_param( 1, IT_STRING );
 
@@ -1180,7 +1180,7 @@ HARBOUR HB___MVGET( void )
    }
 }
 
-HARBOUR HB___MVPUT( void )
+HB_FUNC( __MVPUT )
 {
    HB_ITEM_PTR pName = hb_param( 1, IT_STRING );
    HB_ITEM nil;
@@ -1231,7 +1231,7 @@ HARBOUR HB___MVPUT( void )
 #define HB_MEM_REC_LEN          32
 #define HB_MEM_NUM_LEN          8
 
-HARBOUR HB___MVSAVE( void )
+HB_FUNC( __MVSAVE )
 {
    /* Clipper also checks for the number of arguments here */
    if( hb_pcount() == 3 && ISCHAR( 1 ) && ISCHAR( 2 ) && ISLOG( 3 ) )
@@ -1372,7 +1372,7 @@ HARBOUR HB___MVSAVE( void )
          load (or not load) variable names with a specific name mask.
          [vszakats] */
 
-HARBOUR HB___MVRESTORE( void )
+HB_FUNC( __MVRESTORE )
 {
    /* Clipper checks for the number of arguments here here, but we cannot
       in Harbour since we have two optional parameters as an extension. */
@@ -1508,27 +1508,28 @@ HARBOUR HB___MVRESTORE( void )
 
 /* CA-Clipper 5.2e compatibility functions. */
 
-HARBOUR HB___MCLEAR( void )
+HB_FUNC( __MCLEAR )
 {
-   HB___MVCLEAR();
+   HB_FUNCNAME( __MVCLEAR )();
 }
 
-HARBOUR HB___MRELEASE( void )
+HB_FUNC( __MRELEASE )
 {
-   HB___MVRELEASE();
+   HB_FUNCNAME( __MVRELEASE )();
 }
 
-HARBOUR HB___MXRELEASE( void )
+HB_FUNC( __MXRELEASE )
 {
-   HB___MVXRELEASE();
+   HB_FUNCNAME( __MVXRELEASE )();
 }
 
-HARBOUR HB___MSAVE( void )
+HB_FUNC( __MSAVE )
 {
-   HB___MVSAVE();
+   HB_FUNCNAME( __MVSAVE )();
 }
 
-HARBOUR HB___MRESTORE( void )
+HB_FUNC( __MRESTORE )
 {
-   HB___MVRESTORE();
+   HB_FUNCNAME( __MVRESTORE )();
 }
+
diff --git a/harbour/source/vm/pcount.c b/harbour/source/vm/pcount.c
index 72bd239e82..77f11a7f27 100644
--- a/harbour/source/vm/pcount.c
+++ b/harbour/source/vm/pcount.c
@@ -35,7 +35,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_PCOUNT( void )
+HB_FUNC( PCOUNT )
 {
    /* Skip current function */
    PHB_ITEM pBase = hb_stack.pItems + hb_stack.pBase->item.asSymbol.stackbase;
diff --git a/harbour/source/vm/proc.c b/harbour/source/vm/proc.c
index 52f431066d..60e01154e2 100644
--- a/harbour/source/vm/proc.c
+++ b/harbour/source/vm/proc.c
@@ -46,7 +46,7 @@
 
 #include "hbapi.h"
 
-HARBOUR HB_PROCNAME( void )
+HB_FUNC( PROCNAME )
 {
    int iLevel = hb_parni( 1 ) + 1;  /* we are already inside ProcName() */
    PHB_ITEM pBase = hb_stack.pBase;
@@ -75,7 +75,7 @@ HARBOUR HB_PROCNAME( void )
       hb_retc( "" );
 }
 
-HARBOUR HB_PROCLINE( void )
+HB_FUNC( PROCLINE )
 {
    int iLevel = hb_parni( 1 ) + 1;  /* we are already inside ProcName() */
    PHB_ITEM pBase = hb_stack.pBase;
@@ -92,7 +92,7 @@ HARBOUR HB_PROCLINE( void )
 /* NOTE: Clipper undocumented function, which always returns an empty
          string. [vszakats] */
 
-HARBOUR HB_PROCFILE( void )
+HB_FUNC( PROCFILE )
 {
    hb_retc( "" );
 }
diff --git a/harbour/source/vm/pvalue.c b/harbour/source/vm/pvalue.c
index b18102cfa0..9a62957ac6 100644
--- a/harbour/source/vm/pvalue.c
+++ b/harbour/source/vm/pvalue.c
@@ -37,7 +37,7 @@
 #include "hbapierr.h"
 #include "hbapiitm.h"
 
-HARBOUR HB_HB_PVALUE( void )
+HB_FUNC( HB_PVALUE )
 {
    USHORT uiParam = hb_parni( 1 );
    PHB_ITEM pBase = hb_stack.pItems + hb_stack.pBase->item.asSymbol.stackbase; /* Skip function + self */
diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c
index 541bc645e3..528cb9168f 100644
--- a/harbour/source/vm/runner.c
+++ b/harbour/source/vm/runner.c
@@ -57,7 +57,7 @@
 /* TODO: Fill the error codes with valid ones (instead of 9999) */
 /* TOFIX: Change this assembler hack to something standard and portable */
 /* TODO: Change the fopen()/fread()/fclose() calls to hb_fs*() */
-/* TODO: Add default extension handling */
+/* TOFIX: Fix the memory leak on error. */
 
 /* NOTE: This is the assembler output from : hb_vmExecute( pcode, symbols ).  */
 
@@ -125,7 +125,7 @@ static ULONG     s_ulSymEntry = 0;              /* Link enhancement         */
    binary/executable itself
 */
 
-HARBOUR HB___HRBRUN( void )
+HB_FUNC( __HRBRUN )
 {
    if( hb_pcount() >= 1 )
    {
@@ -206,7 +206,7 @@ HARBOUR HB___HRBRUN( void )
                {
                   /* Exists and NOT static ?  */
 /*                if(    hb_dynsymFind( pSymRead[ ul ].szName ) &&
-                      !( pSymRead[ ul ].cScope & _HB_FS_STATIC ) )
+                      !( pSymRead[ ul ].cScope & HB_FS_STATIC ) )
                   {
                      hb_errRT_BASE( EG_ARG, 9999, "Duplicate symbol", pSymRead[ ul ].szName );
                      bError = TRUE;
@@ -241,7 +241,7 @@ HARBOUR HB___HRBRUN( void )
              */
             for( ul = 0; ul < ulSymbols; ul++ )    /* Check INIT functions     */
             {
-               if( ( pSymRead[ ul ].cScope & _HB_FS_INITEXIT ) == _HB_FS_INITEXIT )
+               if( ( pSymRead[ ul ].cScope & HB_FS_INITEXIT ) == HB_FS_INITEXIT )
                {
                   /* call (_INITSTATICS) function. This function assigns
                    * literal values to static variables only. There is no need
@@ -253,7 +253,7 @@ HARBOUR HB___HRBRUN( void )
             }
             for( ul = 0; ul < ulSymbols; ul++ )    /* Check INIT functions     */
             {
-               if( ( pSymRead[ ul ].cScope & _HB_FS_INITEXIT ) == _HB_FS_INIT )
+               if( ( pSymRead[ ul ].cScope & HB_FS_INITEXIT ) == HB_FS_INIT )
                {
                   hb_vmPushSymbol( pSymRead + ul );
                   hb_vmPushNil();
@@ -275,12 +275,12 @@ HARBOUR HB___HRBRUN( void )
 
             for( ul = 0; ul < ulSymbols; ul++ )    /* Check EXIT functions     */
             {
-               if( ( pSymRead[ ul ].cScope & _HB_FS_INITEXIT ) == _HB_FS_EXIT )
+               if( ( pSymRead[ ul ].cScope & HB_FS_INITEXIT ) == HB_FS_EXIT )
                {
                   hb_vmPushSymbol( pSymRead + ul );
                   hb_vmPushNil();
                   hb_vmDo( 0 );                        /* Run exit function        */
-                  pSymRead[ ul ].cScope = pSymRead[ ul ].cScope & ( ~_HB_FS_EXIT );
+                  pSymRead[ ul ].cScope = pSymRead[ ul ].cScope & ( ~HB_FS_EXIT );
                                                   /* Exit function cannot be
                                                      handled by main in hvm.c */
                }
@@ -515,3 +515,4 @@ static void hb_hrbAsmPatchRelative( BYTE * pCode, ULONG ulOffset,
 /* #elseif ... */
 /* #endif */
 }
+
diff --git a/harbour/utils/hbextern/hbextern.prg b/harbour/utils/hbextern/hbextern.prg
index 46bfd47409..3abd15b5d0 100644
--- a/harbour/utils/hbextern/hbextern.prg
+++ b/harbour/utils/hbextern/hbextern.prg
@@ -122,11 +122,11 @@ PROCEDURE ProcessLine( nOut, cLine )
       ENDIF
    ENDIF
 
-   nPos =AT( "HARBOUR", cLine )
+   nPos =AT( "HB_FUNC(", cLine )
    IF nPos > 0
       cLine = LTRIM( SUBSTR( cLine, nPos+7 ) )
       IF AT( "HB_", cLine ) == 1
-         nPos =AT( "(", cLine )
+         nPos =AT( ")", cLine )
          IF nPos > 0
             cLine :=ALLTRIM( SUBSTR( cLine, 4, nPos-4 ) )
             ? cLine
diff --git a/harbour/utils/hbrun/Makefile b/harbour/utils/hbrun/Makefile
index 7c38174ebe..14940e2b1f 100644
--- a/harbour/utils/hbrun/Makefile
+++ b/harbour/utils/hbrun/Makefile
@@ -10,6 +10,7 @@ ROOT = ../../
 
 PRG_SOURCES=\
 	hbrun.prg \
+        exttools.prg \
 
 PRG_MAIN=hbrun.prg
 
diff --git a/harbour/utils/hbrun/exttools.prg b/harbour/utils/hbrun/exttools.prg
new file mode 100644
index 0000000000..ba8b3cd505
--- /dev/null
+++ b/harbour/utils/hbrun/exttools.prg
@@ -0,0 +1,214 @@
+/*
+ * $Id$
+ */
+
+/*
+ * Harbour Project source code:
+ * The declarations for the functions/procedures defined in TOOLS.
+ *
+ * Copyright 1999 Ryszard Glab <rglab@imid.med.pl>
+ * www - http://www.harbour-project.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version, with one exception:
+ *
+ * The exception is that if you link the Harbour Runtime Library (HRL)
+ * and/or the Harbour Virtual Machine (HVM) with other files to produce
+ * an executable, this does not by itself cause the resulting executable
+ * to be covered by the GNU General Public License. Your use of that
+ * executable is in no way restricted on account of linking the HRL
+ * and/or HVM code into it.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA (or visit
+ * their web site at http://www.gnu.org/).
+ *
+ */
+
+#include "hbsetup.ch"
+
+// Files from: tools
+//
+//
+//symbols from file: tools\asciisum.c
+//
+EXTERNAL GT_ASCIISUM
+//
+//symbols from file: tools\ascpos.c
+//
+EXTERNAL GT_ASCPOS
+//
+//symbols from file: tools\atdiff.c
+//
+EXTERNAL GT_ATDIFF
+//
+//symbols from file: tools\chareven.c
+//
+EXTERNAL GT_CHAREVEN
+//
+//symbols from file: tools\charmix.c
+//
+EXTERNAL GT_CHARMIX
+//
+//symbols from file: tools\charodd.c
+//
+EXTERNAL GT_CHARODD
+//
+//symbols from file: tools\chrcount.c
+//
+EXTERNAL GT_CHRCOUNT
+//
+//symbols from file: tools\chrfirst.c
+//
+EXTERNAL GT_CHRFIRST
+//
+//symbols from file: tools\chrtotal.c
+//
+EXTERNAL GT_CHRTOTAL
+//
+//symbols from file: tools\ctchksum.c
+//
+EXTERNAL CT_CHECKSUM
+//
+//symbols from file: tools\ctchrmix.c
+//
+EXTERNAL CT_CHARMIX
+//
+//symbols from file: tools\ctcrypt.c
+//
+EXTERNAL CT_CRYPT
+//
+//symbols from file: tools\dates2.c
+//
+EXTERNAL AMONTHS
+EXTERNAL ADAYS
+EXTERNAL ISLEAPYEAR
+EXTERNAL DAYSINMONTH
+EXTERNAL EOM
+EXTERNAL BOM
+EXTERNAL WOM
+EXTERNAL DOY
+EXTERNAL WOY
+EXTERNAL EOY
+EXTERNAL BOY
+EXTERNAL DATETIME
+//
+//symbols from file: tools\dbftools.c
+//
+EXTERNAL FIELDTYPE
+EXTERNAL FIELDSIZE
+EXTERNAL FIELDDECI
+//
+//symbols from file: tools\hb_f.c
+//
+EXTERNAL HB_FUSE
+EXTERNAL HB_FRECNO
+EXTERNAL HB_FSKIP
+EXTERNAL HB_FREADLN
+EXTERNAL HB_FEOF
+EXTERNAL HB_FGOTO
+EXTERNAL HB_FGOBOTTOM
+EXTERNAL HB_FGOTOP
+EXTERNAL HB_FLASTREC
+EXTERNAL HB_FSELECT
+//
+//symbols from file: tools\io.c
+//
+EXTERNAL CD
+EXTERNAL MD
+EXTERNAL RD
+EXTERNAL DISKUSED
+EXTERNAL DISKFREE
+EXTERNAL DISKFULL
+//
+//symbols from file: tools\mathx.c
+//
+EXTERNAL ACOS
+EXTERNAL ASIN
+EXTERNAL ATAN
+EXTERNAL COS
+EXTERNAL COSH
+EXTERNAL LOG10
+EXTERNAL SIN
+EXTERNAL SINH
+EXTERNAL TAN
+EXTERNAL TANH
+EXTERNAL PI
+//
+//symbols from file: tools\strcount.c
+//
+EXTERNAL GT_STRCOUNT
+//
+//symbols from file: tools\strcspn.c
+//
+EXTERNAL GT_STRCSPN
+//
+//symbols from file: tools\strdiff.c
+//
+EXTERNAL GT_STRDIFF
+//
+//symbols from file: tools\strexpan.c
+//
+EXTERNAL GT_STREXPAND
+//
+//symbols from file: tools\strfmt.c
+//
+EXTERNAL STRFORMAT
+//
+//symbols from file: tools\stringsx.c
+//
+EXTERNAL STRTOKEN
+EXTERNAL STRDUMP
+EXTERNAL ROT13
+//
+//symbols from file: tools\strleft.c
+//
+EXTERNAL GT_STRLEFT
+//
+//symbols from file: tools\strpbrk.c
+//
+EXTERNAL GT_STRPBRK
+//
+//symbols from file: tools\strright.c
+//
+EXTERNAL GT_STRRIGHT
+//
+//symbols from file: tools\fileread.prg
+//
+EXTERNAL TFILEREAD
+//
+//symbols from file: tools\nconvert.prg
+//
+EXTERNAL ISBIN
+EXTERNAL ISOCTAL
+EXTERNAL ISDEC
+EXTERNAL ISHEXA
+EXTERNAL DECTOBIN
+EXTERNAL DECTOOCTAL
+EXTERNAL DECTOHEXA
+EXTERNAL BINTODEC
+EXTERNAL OCTALTODEC
+EXTERNAL HEXATODEC
+//
+//symbols from file: tools\numtxten.prg
+//
+EXTERNAL NUMTOTXTEN
+//
+//symbols from file: tools\numtxthu.prg
+//
+EXTERNAL NUMTOTXTHU
+//
+//symbols from file: tools\stringp.prg
+//
+EXTERNAL DEFAULT
+EXTERNAL TOCHAR
+EXTERNAL DEBUG
+