diff --git a/harbour/source/vm/maindll.c b/harbour/source/vm/maindll.c
index d2a5079235..c77fe45766 100644
--- a/harbour/source/vm/maindll.c
+++ b/harbour/source/vm/maindll.c
@@ -62,12 +62,7 @@
 
 #if defined(HB_OS_WIN_32)
 
-#if defined(__BORLANDC__)
-BOOL WINAPI _export
-#else
-__declspec(dllexport) BOOL
-#endif
-WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
+BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
 {
    HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason,
              pvReserved ) );
@@ -90,7 +85,7 @@ WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
    return TRUE;
 }
 
-LONG PASCAL _export HBDLLENTRY( char * cProcName )
+LONG PASCAL HB_EXPORT HBDLLENTRY( char * cProcName )
 {
    hb_itemDoC( cProcName, 0, 0 );
 
diff --git a/harbour/source/vm/maindllh.c b/harbour/source/vm/maindllh.c
index c30c233126..9a54ebaf2e 100644
--- a/harbour/source/vm/maindllh.c
+++ b/harbour/source/vm/maindllh.c
@@ -62,12 +62,7 @@
 
 #if defined(HB_OS_WIN_32)
 
-#if defined(__BORLANDC__)
-BOOL WINAPI _export
-#else
-__declspec(dllexport) BOOL
-#endif
-WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
+BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
 {
    HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason,
              pvReserved ) );
diff --git a/harbour/source/vm/maindllp.c b/harbour/source/vm/maindllp.c
index 58c5cd26b7..f4da047bb9 100644
--- a/harbour/source/vm/maindllp.c
+++ b/harbour/source/vm/maindllp.c
@@ -68,12 +68,7 @@ typedef void ( * VM_DLL_EXECUTE ) ( const BYTE * pCode, PHB_SYMB pSymbols );
 
 #if defined(HB_OS_WIN_32)
 
-#if defined(__BORLANDC__)
-BOOL WINAPI _export
-#else
-__declspec(dllexport) BOOL
-#endif
-WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
+BOOL WINAPI HB_EXPORT DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
 {
    HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason,
              pvReserved ) );