diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2a40d296e4..f0273a96f7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,11 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-03-20 14:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/win_shell.c
+    ! Inevitable tweaking for Windows API header / compiler
+      idiocy.
+
 2010-03-20 13:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/hbwin.ch
     + Added WIN_LR_* flag constants for WAPI_LOADIMAGE().
diff --git a/harbour/contrib/hbwin/win_shell.c b/harbour/contrib/hbwin/win_shell.c
index 081a1c04a7..49e122bbb4 100644
--- a/harbour/contrib/hbwin/win_shell.c
+++ b/harbour/contrib/hbwin/win_shell.c
@@ -53,6 +53,13 @@
 #undef _WIN32_IE
 #define _WIN32_IE 0x0500 /* request Windows 2000 features for NOTIFYICONDATA */
 
+/* This code uses named union so this declaration is necessary for
+ * compilers where nameless unions are default
+ */
+#if !defined( NONAMELESSUNION )
+   #define NONAMELESSUNION
+#endif
+
 #include "hbwapi.h"
 
 /* WIN_ShellNotifyIcon( [<hWnd>], [<nUID>], [<nMessage>], [<hIcon>],
@@ -81,7 +88,7 @@ HB_FUNC( WIN_SHELLNOTIFYICON )
    {
       if( HB_ITEMCOPYSTR( hb_param( 7, HB_IT_ANY ), tnid.szInfo, HB_SIZEOFARRAY( tnid.szInfo ) ) > 0 )
          tnid.uFlags |= NIF_INFO;
-      tnid.uTimeout = ( UINT ) hb_parni( 8 );
+      tnid.u.uTimeout = ( UINT ) hb_parni( 8 );
       if( HB_ITEMCOPYSTR( hb_param( 9, HB_IT_ANY ), tnid.szInfoTitle, HB_SIZEOFARRAY( tnid.szInfoTitle ) ) > 0 )
          tnid.uFlags |= NIF_INFO;
       tnid.dwInfoFlags = ( DWORD ) hb_parnl( 10 );