diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 7038226b5..a1e997cc8 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -34,7 +34,7 @@ kadmin_SOURCES =				\
 	kadmin-commands.c			\
 	kadmin_locl.h
 
-$(kadmind_OBJECTS) $(kadmin_OBJECTS): kadmin-commands.h
+$(kadmin_OBJECTS): kadmin-commands.h
 
 CLEANFILES = kadmin-commands.h kadmin-commands.c
 
diff --git a/kadmin/ank.c b/kadmin/ank.c
index 2ff090722..a86fd67a3 100644
--- a/kadmin/ank.c
+++ b/kadmin/ank.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/cpw.c b/kadmin/cpw.c
index bd3841b93..464a3c1df 100644
--- a/kadmin/cpw.c
+++ b/kadmin/cpw.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/del.c b/kadmin/del.c
index fb04231ec..41a4d3a2c 100644
--- a/kadmin/del.c
+++ b/kadmin/del.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/del_enctype.c b/kadmin/del_enctype.c
index 83f398200..50c2c02a8 100644
--- a/kadmin/del_enctype.c
+++ b/kadmin/del_enctype.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/dump.c b/kadmin/dump.c
index 2b45a7b99..0bcfff57c 100644
--- a/kadmin/dump.c
+++ b/kadmin/dump.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 #include <kadm5/private.h>
 
 RCSID("$Id$");
diff --git a/kadmin/ext.c b/kadmin/ext.c
index fca160855..6dd47afea 100644
--- a/kadmin/ext.c
+++ b/kadmin/ext.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/get.c b/kadmin/get.c
index c443a6a41..733c31e41 100644
--- a/kadmin/get.c
+++ b/kadmin/get.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 #include <parse_units.h>
 
 RCSID("$Id$");
diff --git a/kadmin/init.c b/kadmin/init.c
index cd23a332d..5d070c3b8 100644
--- a/kadmin/init.c
+++ b/kadmin/init.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 #include <kadm5/private.h>
 
 RCSID("$Id$");
diff --git a/kadmin/kadmin.c b/kadmin/kadmin.c
index 038975cea..6e0a5aa57 100644
--- a/kadmin/kadmin.c
+++ b/kadmin/kadmin.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 #include <sl.h>
 
 RCSID("$Id$");
diff --git a/kadmin/kadmin_locl.h b/kadmin/kadmin_locl.h
index 757f19f1b..bf6e8b694 100644
--- a/kadmin/kadmin_locl.h
+++ b/kadmin/kadmin_locl.h
@@ -96,8 +96,6 @@
 #include <parse_time.h>
 #include <getarg.h>
 
-#include "kadmin-commands.h"
-
 extern krb5_context context;
 extern void * kadm_handle;
 
diff --git a/kadmin/load.c b/kadmin/load.c
index 6ed67d702..1ada2edff 100644
--- a/kadmin/load.c
+++ b/kadmin/load.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 #include <kadm5/private.h>
 
 RCSID("$Id$");
diff --git a/kadmin/mod.c b/kadmin/mod.c
index 52d36aba7..5df1b9678 100644
--- a/kadmin/mod.c
+++ b/kadmin/mod.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/pw_quality.c b/kadmin/pw_quality.c
index 2a02cd40b..819101097 100644
--- a/kadmin/pw_quality.c
+++ b/kadmin/pw_quality.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/rename.c b/kadmin/rename.c
index 2f0f99959..daf28df7a 100644
--- a/kadmin/rename.c
+++ b/kadmin/rename.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");
 
diff --git a/kadmin/stash.c b/kadmin/stash.c
index b343b0087..bbcaed6f0 100644
--- a/kadmin/stash.c
+++ b/kadmin/stash.c
@@ -32,6 +32,7 @@
  */
 
 #include "kadmin_locl.h"
+#include "kadmin-commands.h"
 
 RCSID("$Id$");