diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a3ebbc4ea5..94d351df4b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-02 19:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbapidbg.h
+    + Added HB_EXPORT to the complete hb_dbg*() API set.
+      This should fix -shared -b builds on win/wce when
+      using non-mingw compiler.
+
+  * src/vm/hvm.c
+    * Formatting.
+
 2010-08-02 09:52 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/idedocks.prg
   * contrib/hbide/idemisc.prg
@@ -44,7 +53,7 @@
 
 2010-08-02 17:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/make.hbs
-    ! Fixed minor but fatal problem in .hdb creation for contribs.
+    ! Fixed minor but fatal problem in .hbd creation for contribs.
     + Will now create docs also for projects referenced from
       project list, but not actually on it (qt sub-projects).
 
@@ -854,7 +863,8 @@
   ; NOTE: BTW HBQT fails very badly on any dynamic lib creating
           attempt, and the reason is that it's still a monolithic
           lib under the surface, just split some files into separate
-          libs to avoid cmdline length.
+          libs to avoid cmdline length. [RESOLVED after complete
+          rework]
 
 2010-07-31 14:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbqt/hbqt.hbc
diff --git a/harbour/include/hbapidbg.h b/harbour/include/hbapidbg.h
index 06dd375433..030b6ecf49 100644
--- a/harbour/include/hbapidbg.h
+++ b/harbour/include/hbapidbg.h
@@ -57,36 +57,36 @@
 
 HB_EXTERN_BEGIN
 
-/*Debugger API */
+/* Debugger API */
 
 /* HVM debugger function */
-typedef void (*HB_DBGENTRY_FUNC) ( int , int , const char *, int , PHB_ITEM );
-extern HB_DBGENTRY_FUNC hb_dbg_SetEntry( HB_DBGENTRY_FUNC pFunDbgEntry );
-extern HB_BOOL hb_dbg_InvokeDebug( HB_BOOL bInvoke );
-extern HB_ULONG hb_dbg_ProcLevel( void );
-extern PHB_ITEM hb_dbg_vmVarSGet( PHB_ITEM pStaticsBase, int nOffset );
-extern PHB_ITEM hb_dbg_vmVarLGet( int iLevel, int iLocal );
-extern HB_ULONG hb_dbg_vmVarGCount( void );
-extern PHB_ITEM hb_dbg_vmVarGGet( int nGlobal, int nOffset );
+typedef void ( * HB_DBGENTRY_FUNC )( int nMode, int nLine, const char * szName, int nIndex, PHB_ITEM pFrame );
+extern HB_EXPORT HB_DBGENTRY_FUNC hb_dbg_SetEntry( HB_DBGENTRY_FUNC pFunDbgEntry );
+extern HB_EXPORT HB_BOOL hb_dbg_InvokeDebug( HB_BOOL bInvoke );
+extern HB_EXPORT HB_ULONG hb_dbg_ProcLevel( void );
+extern HB_EXPORT PHB_ITEM hb_dbg_vmVarSGet( PHB_ITEM pStaticsBase, int nOffset );
+extern HB_EXPORT PHB_ITEM hb_dbg_vmVarLGet( int iLevel, int iLocal );
+extern HB_EXPORT HB_ULONG hb_dbg_vmVarGCount( void );
+extern HB_EXPORT PHB_ITEM hb_dbg_vmVarGGet( int nGlobal, int nOffset );
 
 /* internal debugger function */
-extern void hb_dbgEntry( int nMode, int nLine, const char * szName, int nIndex, PHB_ITEM pFrame );
-extern void hb_dbgAddBreak( void * handle, const char * cModule, int nLine, const char * szFunction );
-extern void hb_dbgAddWatch( void * handle, const char * szExpr, HB_BOOL bTrace );
-extern void hb_dbgDelBreak( void * handle, int nBreak );
-extern void hb_dbgDelWatch( void * handle, int nWatch );
-extern PHB_ITEM hb_dbgGetExpressionValue( void * handle, const char *expression );
-extern PHB_ITEM hb_dbgGetSourceFiles( void * handle );
-extern PHB_ITEM hb_dbgGetWatchValue( void * handle, int nWatch );
-extern HB_BOOL hb_dbgIsValidStopLine( void * handle, const char *szModule, int nLine );
-extern void hb_dbgSetCBTrace( void * handle, HB_BOOL bCBTrace );
-extern void hb_dbgSetGo( void * handle );
-extern void hb_dbgSetInvoke( void * handle, HB_BOOL ( *pFunInvoke )( void ) );
-extern void hb_dbgSetNextRoutine( void * handle );
-extern void hb_dbgSetQuit( void * handle );
-extern void hb_dbgSetToCursor( void * handle, const char * szModule, int nLine );
-extern void hb_dbgSetTrace( void * handle );
-extern void hb_dbgSetWatch( void * handle, int nWatch, const char * szExpr, HB_BOOL bTrace );
+extern HB_EXPORT void hb_dbgEntry( int nMode, int nLine, const char * szName, int nIndex, PHB_ITEM pFrame );
+extern HB_EXPORT void hb_dbgAddBreak( void * handle, const char * cModule, int nLine, const char * szFunction );
+extern HB_EXPORT void hb_dbgAddWatch( void * handle, const char * szExpr, HB_BOOL bTrace );
+extern HB_EXPORT void hb_dbgDelBreak( void * handle, int nBreak );
+extern HB_EXPORT void hb_dbgDelWatch( void * handle, int nWatch );
+extern HB_EXPORT PHB_ITEM hb_dbgGetExpressionValue( void * handle, const char * expression );
+extern HB_EXPORT PHB_ITEM hb_dbgGetSourceFiles( void * handle );
+extern HB_EXPORT PHB_ITEM hb_dbgGetWatchValue( void * handle, int nWatch );
+extern HB_EXPORT HB_BOOL hb_dbgIsValidStopLine( void * handle, const char * szModule, int nLine );
+extern HB_EXPORT void hb_dbgSetCBTrace( void * handle, HB_BOOL bCBTrace );
+extern HB_EXPORT void hb_dbgSetGo( void * handle );
+extern HB_EXPORT void hb_dbgSetInvoke( void * handle, HB_BOOL ( *pFunInvoke )( void ) );
+extern HB_EXPORT void hb_dbgSetNextRoutine( void * handle );
+extern HB_EXPORT void hb_dbgSetQuit( void * handle );
+extern HB_EXPORT void hb_dbgSetToCursor( void * handle, const char * szModule, int nLine );
+extern HB_EXPORT void hb_dbgSetTrace( void * handle );
+extern HB_EXPORT void hb_dbgSetWatch( void * handle, int nWatch, const char * szExpr, HB_BOOL bTrace );
 
 HB_EXTERN_END
 
diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c
index 7fc5990c3c..1c69aa2417 100644
--- a/harbour/src/vm/hvm.c
+++ b/harbour/src/vm/hvm.c
@@ -217,7 +217,7 @@ static void    hb_vmLocalName( HB_USHORT uiLocal, const char * szLocalName ); /*
 static void    hb_vmStaticName( HB_BYTE bIsGlobal, HB_USHORT uiStatic, const char * szStaticName ); /* statics vars information for the debugger */
 static void    hb_vmModuleName( const char * szModuleName ); /* PRG and function name information for the debugger */
 
-static void    hb_vmDebugEntry( int nMode, int nLine, const char *szName, int nIndex, PHB_ITEM pFrame );
+static void    hb_vmDebugEntry( int nMode, int nLine, const char * szName, int nIndex, PHB_ITEM pFrame );
 static void    hb_vmDebuggerExit( HB_BOOL fRemove );      /* shuts down the debugger */
 static void    hb_vmDebuggerShowLine( HB_USHORT uiLine ); /* makes the debugger shows a specific source code line */
 static void    hb_vmDebuggerEndProc( void );     /* notifies the debugger for an endproc */