diff --git a/harbour/include/hbinit.h b/harbour/include/hbinit.h
index a9a0a425b3..91def36cfc 100644
--- a/harbour/include/hbinit.h
+++ b/harbour/include/hbinit.h
@@ -173,6 +173,10 @@ extern void HB_EXPORT hb_vmProcessSymbols( PHB_SYMB pSymbols, USHORT uiSymbols )
 
 #endif
 
+#if ! defined(__GNUC__) && ! defined(_MSC_VER)
+  #define HB_PRAGMA_STARTUP  
+#endif
+
 #if defined(HB_EXTERN_C)
 }
 #endif
diff --git a/harbour/source/codepage/cdpesdos.c b/harbour/source/codepage/cdpesdos.c
index d70fa6aa76..a8e6022a94 100644
--- a/harbour/source/codepage/cdpesdos.c
+++ b/harbour/source/codepage/cdpesdos.c
@@ -32,8 +32,9 @@
 #define ACCENTED_INTERLEAVED   0    
 
 //-----------------------------------------------------------------------------
+// Documentation: see cdp_tpl.c
 
-static HB_CODEPAGE s_codepage = 
+static HB_CODEPAGE s_codepage =        
 { 
   "ES", 
   NUMBER_OF_CHARACTERS,
@@ -55,7 +56,7 @@ static HB_CODEPAGE s_codepage =
 
 HB_CODEPAGE_INIT( ES );
 
-#ifdef HB_USE_PRAGMA_STARTUP
+#ifdef HB_PRAGMA_STARTUP
    #pragma startup hb_codepage_Init_ES
 #endif