diff --git a/ChangeLog b/ChangeLog
index 9f9f282be..e708f3d07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Wed Dec 18 00:53:55 1996  Johan Danielsson  <joda@emma.pdc.kth.se>
+
+	* kuser/kinit.c: Guess principal.
+
+	* lib/krb5/error/compile_et.awk: Don't include krb5.h. Fix some
+ 	warnings.
+
+	* lib/krb5/error/asn1_err.et: Add ASN.1 error messages.
+
+	* lib/krb5/mk_req.c: Get client from cache.
+
+	* lib/krb5/cache.c: Add better error checking some useful return
+ 	values.
+
+	* lib/krb5/krb5.h: Fix krb5_auth_context.
+
+	* lib/asn1/der.h: Make krb5_data compatible with krb5.h
+
 Tue Dec 17 01:32:36 1996  Johan Danielsson  <joda@emma.pdc.kth.se>
 
 	* lib/krb5/error: Add primitive error library.
diff --git a/lib/com_err/error.c b/lib/com_err/error.c
index 683a181fc..23a6a91d1 100644
--- a/lib/com_err/error.c
+++ b/lib/com_err/error.c
@@ -1,5 +1,4 @@
-#include "krb5_locl.h"
-#include <krb5_error.h>
+#include <krb5_locl.h>
 
 RCSID("$Id$");
 
diff --git a/lib/error/error.c b/lib/error/error.c
index 683a181fc..23a6a91d1 100644
--- a/lib/error/error.c
+++ b/lib/error/error.c
@@ -1,5 +1,4 @@
-#include "krb5_locl.h"
-#include <krb5_error.h>
+#include <krb5_locl.h>
 
 RCSID("$Id$");
 
diff --git a/lib/krb5/error/error.c b/lib/krb5/error/error.c
index 683a181fc..23a6a91d1 100644
--- a/lib/krb5/error/error.c
+++ b/lib/krb5/error/error.c
@@ -1,5 +1,4 @@
-#include "krb5_locl.h"
-#include <krb5_error.h>
+#include <krb5_locl.h>
 
 RCSID("$Id$");