diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c72455443d..66d81350b5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-01 22:33 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * contrib/hbgd/make_b32.bat
+   * contrib/hbgd/gdwrp.c
+     ! Fixed the way HB_OS_WIN_32_USED is used and windows.h 
+       is included to work like in rest of Harbour. This way 
+       it works for all compilers/build systems.
+
 2007-12-01 22:21 UTC+0100 Francesco Saverio Giudice (info at fsgiudice dot com)
   * harbour/contrib/hbgd/make_b32.bat
     ! Fixed compilation under BCC
diff --git a/harbour/contrib/hbgd/gdwrp.c b/harbour/contrib/hbgd/gdwrp.c
index 3fce9c35fa..909fe1c819 100644
--- a/harbour/contrib/hbgd/gdwrp.c
+++ b/harbour/contrib/hbgd/gdwrp.c
@@ -58,9 +58,8 @@
 
 /* NOTE: we need this to prevent base types redefinition */
 #define _CLIPDEFS_H
-#if defined(HB_OS_WIN_32_USED)
-   #include <windows.h>
-#endif
+
+#define HB_OS_WIN_32_USED
 
 #include "hbapi.h"
 #include "hbapiitm.h"
diff --git a/harbour/contrib/hbgd/make_b32.bat b/harbour/contrib/hbgd/make_b32.bat
index 47cbf990d8..e99114c651 100644
--- a/harbour/contrib/hbgd/make_b32.bat
+++ b/harbour/contrib/hbgd/make_b32.bat
@@ -14,7 +14,7 @@ goto POST_EXIT
 
 :DIR_OK
 
-set CFLAGS=-I%GD_DIR%\include -DHB_OS_WIN_32_USED
+set CFLAGS=-I%GD_DIR%\include
 set HB_DLL_NAME=bgd
 set HB_DLL_DIR=%GD_DIR%\bin