diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ce3f578e23..c6ef6fc916 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-05-30 11:48 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/hbgd/gdwrp.c
+     * Tweaked the BCC55 hack for WIN32_LEAN_AND_MEAN and gd.h.
+
 2008-05-30 09:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/vm/extrap.c
     ! disabled SetUnhandledExceptionFilter() for WinCE builds
diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c
index 77dca36700..579e347925 100644
--- a/harbour/contrib/hbgd/gdwrp.c
+++ b/harbour/contrib/hbgd/gdwrp.c
@@ -52,18 +52,20 @@
 
 #define HB_OS_WIN_32_USED
 
-/* NOTE: This seems needed to generate proper extern references for BCC. 
-         Reasons unknown so far [vszakats]. */
-#if defined( HB_OS_WIN_32_USED ) && defined( __BORLANDC__ )
-   #include <windows.h>
-#endif
-
 #include "hbapi.h"
 #include "hbapiitm.h"
 #include "hbstack.h"
 #include "hbapierr.h"
 #include "hbapifs.h"
 
+/* NOTE: We need this to generate proper extern references for BCC 5.5 
+         (even 5.8 don't need this hack). Harbour uses WIN32_LEAN_AND_MEAN, 
+         which makes BCC 5.5 leave out something which causes wrong 
+         extern references. So we need full windows.h and we're including it. */
+#ifdef HB_OS_WIN_32
+   #include <windows.h>
+#endif
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif