diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1606bfc6d1..55710072d7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-09 12:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/legacyco.c
+  * contrib/hbwin/wapi_winuser.c
+    ! Added missing header.
+
+  * ChangeLog
+    + Missed change added to prev entry.
+
 2009-12-09 04:06 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbwinuni.h
     + Added HB_PARSTRDEF() macro. So far the same as HB_PARSTR(), but
@@ -32,6 +40,8 @@
             Here the string is assigned to win structure and passed to winapi,
             which may mean that string space should be kept there after
             returning from function.
+    ! WAPI_FORMATMESSAGE() fixed to return empty string (instead of gargabe)
+      if there was an error returned (f.e. because of too small, or no buffer).
 
   * contrib/hbxbp/xbpgeneric.prg
     ! Using HB_SYMBOL_UNUSED() to mark unused parameters, instead of
diff --git a/harbour/contrib/hbwin/legacyco.c b/harbour/contrib/hbwin/legacyco.c
index 4103446328..fabef4ae08 100644
--- a/harbour/contrib/hbwin/legacyco.c
+++ b/harbour/contrib/hbwin/legacyco.c
@@ -61,6 +61,7 @@
 
 #include "hbapi.h"
 #include "hbwinole.h"
+#include "hbwinuni.h"
 
 #if ! defined( HB_LEGACY_LEVEL3 ) && ! defined( HB_WIN_LEGACY_LEVEL_OFF )
    #define HB_WIN_LEGACY_LEVEL_OFF
diff --git a/harbour/contrib/hbwin/wapi_winuser.c b/harbour/contrib/hbwin/wapi_winuser.c
index 2ab8d5534d..9bb9321b78 100644
--- a/harbour/contrib/hbwin/wapi_winuser.c
+++ b/harbour/contrib/hbwin/wapi_winuser.c
@@ -55,6 +55,7 @@
 #define HB_OS_WIN_USED
 
 #include "hbapi.h"
+#include "hbwinuni.h"
 #include "hbwapi.h"
 
 #include <winuser.h>