samba - Dec 2004 - Compiling Samba 3.0.9 on Solaris 2.6 gives conflicts :-(

Hi,
I have to build Samba 3.0.9 on a customers Sun E3500 with Solaris 2.6. 
They recently upgraded to Windows 200x domain with AD.
When i try to compile with Heimdal or MIT Kerberos i get the following 
error:

Using FLAGS =  -I/usr/heimdal/include 
-I/usr/local/BerkeleyDB.4.2/include -I/usr/local/ssl/include 
-I/usr/heimdal/include -L/usr/local/BerkeleyDB.4.2/lib 
-L/usr/local/ssl/lib -L/usr/heimdal/lib -I./popt -Iinclude 
-I/opt/tmp/samba-3.0.9/source/include 
-I/opt/tmp/samba-3.0.9/source/ubiqx 
-I/opt/tmp/samba-3.0.9/source/smbwrapper  -I. -I/usr/heimdal/include 
-I/usr/local/BerkeleyDB.4.2/include -I/usr/local/ssl/include 
-I/usr/heimdal/include -L/usr/local/BerkeleyDB.4.2/lib 
-L/usr/local/ssl/lib -L/usr/heimdal/lib -D_LARGEFILE_SOURCE -D_REENTRANT 
-D_FILE_OFFSET_BITS=64 -I/opt/tmp/samba-3.0.9/source
      LIBS = -lsec -lgen -lresolv -lsocket -lnsl -ldl -liconv
      LDSHFLAGS = -G  -L/usr/heimdal/lib 
-I/usr/local/BerkeleyDB.4.2/include -I/usr/local/ssl/include 
-I/usr/heimdal/include -L/usr/local/BerkeleyDB.4.2/lib 
-L/usr/local/ssl/lib -L/usr/heimdal/lib -lthread
      LDFLAGS = -L/usr/heimdal/lib -I/usr/local/BerkeleyDB.4.2/include 
-I/usr/local/ssl/include -I/usr/heimdal/include 
-L/usr/local/BerkeleyDB.4.2/lib -L/usr/local/ssl/lib -L/usr/heimdal/lib 
-lthread
Compiling dynconfig.c
In file included from include/includes.h:457,
                 from dynconfig.c:21:
/usr/heimdal/include/gssapi.h:76: error: conflicting types for 
'gss_ctx_id_t'
/usr/include/rpc/rpcsec_gss.h:59: error: previous declaration of 
'gss_ctx_id_t' was here
/usr/heimdal/include/gssapi.h:103: error: conflicting types for 
'gss_cred_id_t'
/usr/include/rpc/rpcsec_gss.h:60: error: previous declaration of 
'gss_cred_id_t' was here
/usr/heimdal/include/gssapi.h:116: error: conflicting types for 
'gss_channel_bindings_t'
/usr/include/rpc/rpcsec_gss.h:61: error: previous declaration of 
'gss_channel_bindings_t' was here
make: *** [dynconfig.o] Error 1

Is there somebody out there that can give me a hint please ... i need to 
get my Samba running quick.

Regards
Jimmy Jonsson