diff --git a/kdc/hprop.h b/kdc/hprop.h
index 31de5d9f0..dd07c2b9b 100644
--- a/kdc/hprop.h
+++ b/kdc/hprop.h
@@ -41,7 +41,7 @@
 #ifndef __HPROP_H__
 #define __HPROP_H__
 
-#include "kdc_locl.h"
+#include "headers.h"
 
 #define HPROP_VERSION "hprop-0.0"
 #define HPROP_NAME "hprop"
diff --git a/kdc/kdc_locl.h b/kdc/kdc_locl.h
index 8a988abbf..7da165c5a 100644
--- a/kdc/kdc_locl.h
+++ b/kdc/kdc_locl.h
@@ -43,49 +43,7 @@
 #ifndef __KDC_LOCL_H__
 #define __KDC_LOCL_H__
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdarg.h>
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#include <err.h>
-#include <roken.h>
-#include <getarg.h>
-#include <krb5.h>
-#include <hdb_err.h>
-
-#ifdef KRB4
-#define krb_as_req krb4_as_req
-#include <krb.h>
-#include <prot.h>
-#endif
-
-#include "hdb.h"
+#include "headers.h"
 
 extern krb5_context context;
 
@@ -123,6 +81,4 @@ char* kdc_log_msg(int, const char*, ...);
 
 Key *unseal_key(Key *key);
 
-#define ALLOC(X) ((X) = malloc(sizeof(*(X))))
-
 #endif /* __KDC_LOCL_H__ */
diff --git a/kdc/string2key.c b/kdc/string2key.c
index 724fd0eb7..793e1c2c1 100644
--- a/kdc/string2key.c
+++ b/kdc/string2key.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE. 
  */
 
-#include "kdc_locl.h"
+#include "headers.h"
 #include <getarg.h>
 
 RCSID("$Id$");