diff --git a/harbour/contrib/hgf/win32/tform.prg b/harbour/contrib/hgf/win32/tform.prg
index 939de16eae..446d248088 100644
--- a/harbour/contrib/hgf/win32/tform.prg
+++ b/harbour/contrib/hgf/win32/tform.prg
@@ -62,7 +62,7 @@
 
 static aForms := {}
 
-CLASS TForm FROM TPersistent
+CLASS TForm FROM HBPersistent
 
    DATA      hWnd
    DATA      oMainMenu
diff --git a/harbour/contrib/hgf/win32/tmenu.prg b/harbour/contrib/hgf/win32/tmenu.prg
index a6efd0a37f..13b5f16f6e 100644
--- a/harbour/contrib/hgf/win32/tmenu.prg
+++ b/harbour/contrib/hgf/win32/tmenu.prg
@@ -53,7 +53,7 @@
 
 #include "hbclass.ch"
 
-CLASS TMenu FROM TPersistent
+CLASS TMenu FROM HBPersistent
 
    DATA   nHandle
    DATA   Items    PROPERTY