diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index be1d903364..83c1a19fc1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-16 20:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbstack.h
+  * include/hbapi.h
+    ! Marked functions as HB_EXPORT (should be HB_EXPORT_INT in the future)
+      which are used by hbdebug lib. It caused link error when using
+      '-b -shared' hbmk2 options on non-mingw windows compilers:
+         hb_stackDebugInfo
+         hb_macroGetType
+         hb_macroGetValue
+         hb_memvarGetValueBySym
+
 2011-04-16 19:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * src/common/hbtrace.c
   * contrib/xhb/hbsyslog.c
diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h
index a6924f77ec..1713284cf2 100644
--- a/harbour/include/hbapi.h
+++ b/harbour/include/hbapi.h
@@ -1054,7 +1054,7 @@ extern           char *     hb_memvarGetStrValuePtr( char * szVarName, HB_SIZE *
 extern           void       hb_memvarCreateFromItem( PHB_ITEM pMemvar, int iScope, PHB_ITEM pValue );
 extern           int        hb_memvarScope( const char * szVarName, HB_SIZE nLength ); /* retrieve scope of a dynamic variable symbol */
 extern           PHB_ITEM   hb_memvarDetachLocal( HB_ITEM_PTR pLocal ); /* Detach a local variable from the eval stack */
-extern           PHB_ITEM   hb_memvarGetValueBySym( PHB_DYNS pDynSym );
+extern HB_EXPORT PHB_ITEM   hb_memvarGetValueBySym( PHB_DYNS pDynSym );
 extern HB_EXPORT PHB_ITEM   hb_memvarSaveInArray( int iScope, HB_BOOL fCopy ); /* create array with visible memvar references or copies respecting given memvars scope */
 extern           void       hb_memvarRestoreFromArray( PHB_ITEM pArray );
 
@@ -1092,19 +1092,19 @@ typedef struct HB_MACRO_ * HB_MACRO_PTR;
 #else
 typedef void * HB_MACRO_PTR;
 #endif
-extern void   hb_macroGetValue( HB_ITEM_PTR pItem, int iContext, int flags ); /* retrieve results of a macro expansion */
-extern void   hb_macroSetValue( HB_ITEM_PTR pItem, int flags ); /* assign a value to a macro-expression item */
-extern void   hb_macroPushReference( HB_ITEM_PTR pItem ); /* push reference to given expression */
-extern void   hb_macroTextValue( HB_ITEM_PTR pItem ); /* macro text substitution */
-extern void   hb_macroPushSymbol( HB_ITEM_PTR pItem ); /* handle a macro function calls, e.g. var := &macro() */
-extern void   hb_macroRun( HB_MACRO_PTR pMacro ); /* executes pcode compiled by macro compiler */
-extern HB_MACRO_PTR hb_macroCompile( const char * szString ); /* compile a string and return a pcode buffer */
-extern void   hb_macroDelete( HB_MACRO_PTR pMacro ); /* release all memory allocated for macro evaluation */
-extern char * hb_macroTextSymbol( const char * szString, HB_SIZE nLength, HB_BOOL * pfNewString ); /* substitute macro variables occurences within a given string and check if result is a valid function or variable name */
-extern char * hb_macroExpandString( const char * szString, HB_SIZE nLength, HB_BOOL * pfNewString ); /* expands valid '&' operator */
-extern void   hb_macroPopAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags ); /* compiles and evaluates an aliased macro expression */
-extern void   hb_macroPushAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags ); /* compiles and evaluates an aliased macro expression */
-extern const char * hb_macroGetType( HB_ITEM_PTR pItem ); /* determine the type of an expression */
+extern HB_EXPORT void         hb_macroGetValue( HB_ITEM_PTR pItem, int iContext, int flags ); /* retrieve results of a macro expansion */
+extern           void         hb_macroSetValue( HB_ITEM_PTR pItem, int flags ); /* assign a value to a macro-expression item */
+extern           void         hb_macroPushReference( HB_ITEM_PTR pItem ); /* push reference to given expression */
+extern           void         hb_macroTextValue( HB_ITEM_PTR pItem ); /* macro text substitution */
+extern           void         hb_macroPushSymbol( HB_ITEM_PTR pItem ); /* handle a macro function calls, e.g. var := &macro() */
+extern           void         hb_macroRun( HB_MACRO_PTR pMacro ); /* executes pcode compiled by macro compiler */
+extern           HB_MACRO_PTR hb_macroCompile( const char * szString ); /* compile a string and return a pcode buffer */
+extern           void         hb_macroDelete( HB_MACRO_PTR pMacro ); /* release all memory allocated for macro evaluation */
+extern           char *       hb_macroTextSymbol( const char * szString, HB_SIZE nLength, HB_BOOL * pfNewString ); /* substitute macro variables occurences within a given string and check if result is a valid function or variable name */
+extern           char *       hb_macroExpandString( const char * szString, HB_SIZE nLength, HB_BOOL * pfNewString ); /* expands valid '&' operator */
+extern           void         hb_macroPopAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags ); /* compiles and evaluates an aliased macro expression */
+extern           void         hb_macroPushAliasedValue( HB_ITEM_PTR pAlias, HB_ITEM_PTR pVar, int flags ); /* compiles and evaluates an aliased macro expression */
+extern HB_EXPORT const char * hb_macroGetType( HB_ITEM_PTR pItem ); /* determine the type of an expression */
 
 /* idle states */
 extern HB_EXPORT void hb_releaseCPU( void );
diff --git a/harbour/include/hbstack.h b/harbour/include/hbstack.h
index 6cd8160f1f..c829a906bc 100644
--- a/harbour/include/hbstack.h
+++ b/harbour/include/hbstack.h
@@ -316,7 +316,7 @@ extern void *       hb_stackGetGT( void );
 extern void         hb_stackSetGT( void * );
 extern PHB_STACKRDD hb_stackRDD( void );
 
-extern void **      hb_stackDebugInfo( void );
+extern HB_EXPORT void ** hb_stackDebugInfo( void );
 
 #ifdef _HB_API_INTERNAL_
 extern void        hb_stackDec( void );