diff --git a/lib/krb5/acache.c b/lib/krb5/acache.c
index ace0b290e..bacc95693 100644
--- a/lib/krb5/acache.c
+++ b/lib/krb5/acache.c
@@ -32,189 +32,13 @@
  */
 
 #include "krb5_locl.h"
+#include <krb5_ccapi.h>
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
 
 RCSID("$Id$");
 
-/* move ccapi structures to own headerfile when we need it */
-
-enum {
-    cc_credentials_v5 = 2
-};
-
-enum {
-    ccapi_version_3 = 3
-};
-
-enum {
-    ccNoError						= 0,
-    
-    ccIteratorEnd					= 201,
-    ccErrBadParam,
-    ccErrNoMem,
-    ccErrInvalidContext,
-    ccErrInvalidCCache,
-
-    ccErrInvalidString,					/* 206 */
-    ccErrInvalidCredentials,
-    ccErrInvalidCCacheIterator,
-    ccErrInvalidCredentialsIterator,
-    ccErrInvalidLock,
-    
-    ccErrBadName,					/* 211 */
-    ccErrBadCredentialsVersion,
-    ccErrBadAPIVersion,
-    ccErrContextLocked,
-    ccErrContextUnlocked,
-    
-    ccErrCCacheLocked,					/* 216 */
-    ccErrCCacheUnlocked,
-    ccErrBadLockType,
-    ccErrNeverDefault,
-    ccErrCredentialsNotFound,
-    
-    ccErrCCacheNotFound,				/* 221 */
-    ccErrContextNotFound,
-    ccErrServerUnavailable,
-    ccErrServerInsecure,
-    ccErrServerCantBecomeUID,
-    
-    ccErrTimeOffsetNotSet				/* 226 */
-};
-
-typedef int32_t cc_int32;
-typedef u_int32_t cc_uint32;
-typedef struct cc_context_t *cc_context_t;
-typedef struct cc_ccache_t *cc_ccache_t;
-typedef struct cc_ccache_iterator_t *cc_ccache_iterator_t;
-typedef struct cc_credentials_v5_t cc_credentials_v5_t;
-typedef struct cc_credentials_t *cc_credentials_t;
-typedef struct cc_credentials_iterator_t *cc_credentials_iterator_t;
-typedef struct cc_string_t *cc_string_t;
-typedef time_t cc_time_t;
-
-typedef struct cc_data {
-    cc_uint32 type;
-    cc_uint32 length;
-    void *data;
-} cc_data;
-
-struct cc_credentials_v5_t {
-    char *client;
-    char *server;
-    cc_data keyblock;
-    cc_time_t authtime;
-    cc_time_t starttime;
-    cc_time_t endtime;
-    cc_time_t renew_till;
-    cc_uint32 is_skey;
-    cc_uint32 ticket_flags; /* XXX ticket flags undefined */
-    cc_data **addresses;
-    cc_data ticket;
-    cc_data second_ticket;
-    cc_data **authdata;
-};
-
-
-typedef struct cc_string_functions {
-    cc_int32 (*release)(cc_string_t);
-} cc_string_functions;
-
-struct cc_string_t {
-    const char *data;
-    const cc_string_functions *func;
-};
-
-typedef struct cc_credentials_union {
-    cc_int32 version;
-    union {
-	cc_credentials_v5_t* credentials_v5;
-    } credentials;
-} cc_credentials_union;
-
-struct cc_credentials_functions {
-    cc_int32 (*release)(cc_credentials_t);
-    cc_int32 (*compare)(cc_credentials_t, cc_credentials_t, cc_uint32*);
-};
-
-struct cc_credentials_t {
-    const cc_credentials_union* data;
-    const struct cc_credentials_functions* func;
-};
-
-struct cc_credentials_iterator_functions {
-    cc_int32 (*release)(cc_credentials_iterator_t);
-    cc_int32 (*next)(cc_credentials_iterator_t, cc_credentials_t*);
-};
-
-struct cc_credentials_iterator_t {
-    const struct cc_credentials_iterator_functions *func;
-};
-
-struct cc_ccache_iterator_functions {
-    cc_int32 (*release) (cc_ccache_iterator_t);
-    cc_int32 (*next)(cc_ccache_iterator_t, cc_ccache_t*);
-};
-
-struct cc_ccache_iterator_t {
-    const struct cc_ccache_iterator_functions* func;
-};
-
-typedef struct cc_ccache_functions {
-    cc_int32 (*release)(cc_ccache_t);
-    cc_int32 (*destroy)(cc_ccache_t);
-    cc_int32 (*set_default)(cc_ccache_t);
-    cc_int32 (*get_credentials_version)(cc_ccache_t, cc_uint32*);
-    cc_int32 (*get_name)(cc_ccache_t ccache,cc_string_t*);
-    cc_int32 (*get_principal)(cc_ccache_t, cc_uint32, cc_string_t*);
-    cc_int32 (*set_principal)(cc_ccache_t, cc_uint32, const char*);
-    cc_int32 (*store_credentials)(cc_ccache_t, const cc_credentials_union*);
-    cc_int32 (*remove_credentials)(cc_ccache_t, cc_credentials_t);
-    cc_int32 (*new_credentials_iterator)(cc_ccache_t,
-					 cc_credentials_iterator_t*);
-    cc_int32 (*move)(cc_ccache_t source, cc_ccache_t);
-    cc_int32 (*lock)(cc_ccache_t, cc_uint32, cc_uint32);
-    cc_int32 (*unlock)(cc_ccache_t);
-    cc_int32 (*get_last_default_time)(cc_ccache_t, cc_time_t*);
-    cc_int32 (*get_change_time)(cc_ccache_t ccache, cc_time_t*);
-    cc_int32 (*compare)(cc_ccache_t, cc_ccache_t, cc_uint32*);
-    cc_int32 (*get_kdc_time_offset)(cc_ccache_t, cc_int32, cc_time_t *);
-    cc_int32 (*set_kdc_time_offset)(cc_ccache_t, cc_int32, cc_time_t);
-    cc_int32 (*clear_kdc_time_offset)(cc_ccache_t, cc_int32);
-} cc_ccache_functions;
-
-struct cc_ccache_t {
-    const cc_ccache_functions *func;
-};
-
-struct  cc_context_functions {
-    cc_int32 (*release)(cc_context_t);
-    cc_int32 (*get_change_time)(cc_context_t, cc_time_t *);
-    cc_int32 (*get_default_ccache_name)(cc_context_t, cc_string_t*);
-    cc_int32 (*open_ccache)(cc_context_t, const char*, cc_ccache_t *);
-    cc_int32 (*open_default_ccache)(cc_context_t, cc_ccache_t*);
-    cc_int32 (*create_ccache)(cc_context_t,const char*, cc_uint32,
-			      const char*, cc_ccache_t*);
-    cc_int32 (*create_default_ccache)(cc_context_t, cc_uint32,
-				      const char*, cc_ccache_t*);
-    cc_int32 (*create_new_ccache)(cc_context_t, cc_uint32,
-				  const char*, cc_ccache_t*);
-    cc_int32 (*new_ccache_iterator)(cc_context_t, cc_ccache_iterator_t*);
-    cc_int32 (*lock)(cc_context_t, cc_uint32, cc_uint32);
-    cc_int32 (*unlock)(cc_context_t);
-    cc_int32 (*compare)(cc_context_t, cc_context_t, cc_uint32*);
-};
-
-struct cc_context_t {
-    const struct cc_context_functions*	func;
-};
-
-typedef cc_int32 
-(*cc_initialize_func)(cc_context_t*, cc_int32, cc_int32 *, char const **);
-
-/* end of ccapi defintions */
 
 /* XXX should we fetch these for each open ? */