diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5988924c93..e63c94df6f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-25 18:19 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbfimage/fi_winfu.c
+   * contrib/hbfimage/fi_wrp.c
+     ! I cannot test it right now, but this should fix the 
+       build problem for hbfimage under Linux.
+
 2008-06-25 16:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbver.h
     * removed unnecessary EOL inside comment
diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c
index 54e6fddc9a..cb759a4ea2 100644
--- a/harbour/contrib/hbfimage/fi_winfu.c
+++ b/harbour/contrib/hbfimage/fi_winfu.c
@@ -52,10 +52,6 @@
 
 #define HB_OS_WIN_32_USED
 
-#if defined(__GNUC__) && !defined(_WINDOWS_)
-   #define _WINDOWS_
-#endif
-
 #include "hbapi.h"
 #include "hbapiitm.h"
 #include "hbstack.h"
@@ -63,6 +59,10 @@
 #include "hbapifs.h"
 #include "hbvm.h"
 
+#if defined(HB_OS_WIN_32) && defined(__GNUC__) && !defined(_WINDOWS_)
+   #define _WINDOWS_
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c
index 21ec6bc2e6..1304da3f95 100644
--- a/harbour/contrib/hbfimage/fi_wrp.c
+++ b/harbour/contrib/hbfimage/fi_wrp.c
@@ -52,10 +52,6 @@
 
 #define HB_OS_WIN_32_USED
 
-#if defined(__GNUC__) && !defined(_WINDOWS_)
-   #define _WINDOWS_
-#endif
-
 #include "hbapi.h"
 #include "hbapiitm.h"
 #include "hbstack.h"
@@ -63,6 +59,10 @@
 #include "hbapifs.h"
 #include "hbvm.h"
 
+#if defined(HB_OS_WIN_32) && defined(__GNUC__) && !defined(_WINDOWS_)
+   #define _WINDOWS_
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif