diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5157f5ac1d..d8325158fd 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,7 @@
+20000522-01:51 DST Paul Tucker <ptucker@sympatico.ca>
+   * include/hbcomp.h
+     * adjust declaration of COMCLASS and COMDECLARE
+
 20000521-21:50 GMT-8 Ron Pinkas <Ron@Profit-Master.com>
 
    * source/compiler/harbour.y
diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h
index cc241e3d3b..2dc385de8a 100644
--- a/harbour/include/hbcomp.h
+++ b/harbour/include/hbcomp.h
@@ -91,22 +91,20 @@ typedef struct _COMDECLARED
    BYTE   cType;
    BYTE * cParamTypes;
    USHORT iParamCount;
-   struct _COMCLASS { char * szName; struct _COMDECLARED * pMethod; struct _COMCLASS * pNext; struct _COMDECLARED * pLast; } * pClass;
+   struct _COMCLASS * pClass;
    struct _COMCLASS * ( * pParamClasses );
    struct _COMDECLARED * pNext;   /* pointer to the next declared function */
 } COMDECLARED, * PCOMDECLARED;
 
-/*
+
+/* Declared Class support structure */
 typedef struct _COMCLASS
 {
    char * szName;
    PCOMDECLARED pMethod;
    struct _COMCLASS * pNext;
+   PCOMDECLARED pLast;
 } COMCLASS, * PCOMCLASS;
-*/
-
-/* Declared Class support structure */
-typedef struct _COMCLASS COMCLASS, * PCOMCLASS;
 
 /* locals, static, public variables support */
 typedef struct _VAR