Problem compiling current CVS on Redhat 8

[Martin Cracauer]

wine/dlls/comcat/:

comcat_private.h:45: conflicting types for `ClassFactoryImpl'
comcat.h:49: previous declaration of `ClassFactoryImpl'
[more of same error for ther types]

The two struct definitions actually are the same

typedef struct
{
    /* IUnknown fields */
    ICOM_VFIELD(IClassFactory);
    DWORD ref;
} ClassFactoryImpl;

However, the
  gcc version 3.2 20020903 (Red Hat Linux 8.0 3.2-7)
on Redhat 8 rejects the redefinition of the extern class which
follows:
extern ClassFactoryImpl COMCAT_ClassFactory;

Is it neccessary to declare these types two times and/or include both
*.h files?

I also get this:
gcc -c -I. -I. -I../../include -I../../include  -g -O2 -Wall
-mpreferred-stack-boundary=2 -gstabs+  -fPIC -D__WINESRC__
-D_REENTRANT -o comcat_main.o comcat_main.c
In file included from comcat.h:28,
                 from comcat_private.h:29,
                 from comcat_main.c:21:
../../include/wine/obj_base.h:26:2: #error DO NOT INCLUDE DIRECTLY

Martin