diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8d1f01a09d..1d6240fc19 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,14 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-01-15 10:43 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbwmain.c
+  * src/vm/cmdarg.c
+    ! Fixed missing declaration for hb_winmainArgInit()
+    ! Fixed missing HB_EXTERN_* from around hb_winmainArgInit() declaration.
+    ; Patches from Andi. Thank you.
+    * Added HB_EXPORT to the declaration in hbwmain.c.
+
 2011-01-15 01:15 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbcomp.h
     * do not inherit in macrocompiler -z compile time switch when -kc is
diff --git a/harbour/include/hbwmain.c b/harbour/include/hbwmain.c
index 1db0c0ac93..659b2a44da 100644
--- a/harbour/include/hbwmain.c
+++ b/harbour/include/hbwmain.c
@@ -64,7 +64,9 @@ static char * s_argv[ HB_MAX_ARGS ];
 #endif
 
 #if defined( HB_VM_STARTUP )
-extern void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
+HB_EXTERN_BEGIN
+extern HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
+HB_EXTERN_END
 #endif
 
 int WINAPI WinMain( HINSTANCE hInstance,      /* handle to current instance */
diff --git a/harbour/src/vm/cmdarg.c b/harbour/src/vm/cmdarg.c
index 094a1fa36a..ab3161381e 100644
--- a/harbour/src/vm/cmdarg.c
+++ b/harbour/src/vm/cmdarg.c
@@ -88,6 +88,10 @@ static HANDLE  s_hPrevInstance = 0;
 static int     s_iCmdShow      = 0;
 static HB_BOOL s_WinMainParam  = HB_FALSE;
 
+HB_EXTERN_BEGIN
+extern HB_EXPORT void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow ); /* Set WinMain() parameters */
+HB_EXTERN_END
+
 void hb_winmainArgInit( HANDLE hInstance, HANDLE hPrevInstance, int iCmdShow )
 {
    s_hInstance = hInstance;