diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 14ebfac2d9..967b79b619 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-21 18:03 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   - contrib/hbgf/hbgfw32/win32.ch
+   + contrib/hbgf/hbgfw32/hbgfw32.ch
+   * contrib/hbgf/hbgfw32/common.mak
+   * contrib/hbgf/hbgfw32/button.prg
+   * contrib/hbgf/hbgfw32/form.prg
+   * contrib/hbgf/hbgfw32/edit.prg
+     ! Made the .ch name less generic.
+
 2008-06-21 17:58 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/Makefile
    - contrib/hbgf/gtk
diff --git a/harbour/contrib/hbgf/hbgfw32/button.prg b/harbour/contrib/hbgf/hbgfw32/button.prg
index ed12b85d81..9bed2eb616 100644
--- a/harbour/contrib/hbgf/hbgfw32/button.prg
+++ b/harbour/contrib/hbgf/hbgfw32/button.prg
@@ -53,7 +53,7 @@
 
 #include "common.ch"
 #include "hbclass.ch"
-#include "win32.ch"
+#include "hbgfw32.ch"
 
 CLASS HBButton FROM HBWinControl
 
diff --git a/harbour/contrib/hbgf/hbgfw32/common.mak b/harbour/contrib/hbgf/hbgfw32/common.mak
index c0be63c55a..4e953b4f72 100644
--- a/harbour/contrib/hbgf/hbgfw32/common.mak
+++ b/harbour/contrib/hbgf/hbgfw32/common.mak
@@ -7,7 +7,7 @@ LIBNAME = hbgfw32
 LIB_PATH = $(LIB_DIR)$(LIBNAME)$(LIBEXT)
 
 PRG_HEADERS = \
-    win32.ch \
+    hbgfw32.ch \
 
 LIB_OBJS = \
     $(OBJ_DIR)win32$(OBJEXT) \
diff --git a/harbour/contrib/hbgf/hbgfw32/edit.prg b/harbour/contrib/hbgf/hbgfw32/edit.prg
index f72f89e451..24baef7f98 100644
--- a/harbour/contrib/hbgf/hbgfw32/edit.prg
+++ b/harbour/contrib/hbgf/hbgfw32/edit.prg
@@ -53,7 +53,7 @@
 
 #include "common.ch"
 #include "hbclass.ch"
-#include "win32.ch"
+#include "hbgfw32.ch"
 
 CLASS HBEdit FROM HBWinControl
 
diff --git a/harbour/contrib/hbgf/hbgfw32/form.prg b/harbour/contrib/hbgf/hbgfw32/form.prg
index 68c8c54a09..ae5fb91d8d 100644
--- a/harbour/contrib/hbgf/hbgfw32/form.prg
+++ b/harbour/contrib/hbgf/hbgfw32/form.prg
@@ -54,7 +54,7 @@
 
 #include "common.ch"
 #include "hbclass.ch"
-#include "win32.ch"
+#include "hbgfw32.ch"
 
 static aForms := {}
 
diff --git a/harbour/contrib/hbgf/hbgfw32/win32.ch b/harbour/contrib/hbgf/hbgfw32/hbgfw32.ch
similarity index 98%
rename from harbour/contrib/hbgf/hbgfw32/win32.ch
rename to harbour/contrib/hbgf/hbgfw32/hbgfw32.ch
index a71afc8074..3fc9587b4a 100644
--- a/harbour/contrib/hbgf/hbgfw32/win32.ch
+++ b/harbour/contrib/hbgf/hbgfw32/hbgfw32.ch
@@ -51,8 +51,8 @@
  *
  */
 
-#ifndef HB_WIN32_CH_
-#define HB_WIN32_CH_
+#ifndef HB_GFW32_CH_
+#define HB_GFW32_CH_
 
 #define WM_CLOSE        0x0010
 #define WM_COMMAND      0x0111
@@ -77,4 +77,4 @@
 #define WS_CHILD     0x40000000
 #define WS_TABSTOP   0x00010000
 
-#endif
\ No newline at end of file
+#endif