diff --git a/lib/kadm5/context_s.c b/lib/kadm5/context_s.c
index a6bd7b887..d5b9d4f25 100644
--- a/lib/kadm5/context_s.c
+++ b/lib/kadm5/context_s.c
@@ -47,7 +47,8 @@ kadm5_s_lock(void *server_handle)
 	 * open if the DB was locked with a prior call to kadm5_lock(),
 	 * so if it's open here that must be because the DB is locked.
 	 */
-	assert( context->db->lock_count > 0 );
+	heim_assert(context->db->lock_count > 0,
+		    "Internal error in tracking HDB locks");
 	return KADM5_ALREADY_LOCKED;
     }
 
diff --git a/lib/kadm5/kadm5_locl.h b/lib/kadm5/kadm5_locl.h
index 68b6a5ebf..11c3ed1bd 100644
--- a/lib/kadm5/kadm5_locl.h
+++ b/lib/kadm5/kadm5_locl.h
@@ -38,6 +38,7 @@
 
 #include <config.h>
 #include <roken.h>
+#include <heimbase.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/kadm5/log.c b/lib/kadm5/log.c
index b70962f5e..76084b09a 100644
--- a/lib/kadm5/log.c
+++ b/lib/kadm5/log.c
@@ -717,10 +717,10 @@ kadm5_log_replay_modify (kadm5_server_context *context,
 	 *                              choice_HDB_extension_data_hist_keys);
 	 *
 	 * Maybe we should do this here anyways, wasteful as it would
-	 * be, as a defensive programming measure?  For now we stick an
-	 * assert().
+	 * be, as a defensive programming measure?  For now we heim_assert().
 	 */
-	assert( (mask & KADM5_TL_DATA) );
+	heim_assert((mask & KADM5_TL_DATA),
+		    "Wouldn't log and replay key history");
 
 	for (i = 0; i < ent.entry.keys.len; ++i)
 	    free_Key(&ent.entry.keys.val[i]);