diff --git a/lib/kadm5/client_glue.c b/lib/kadm5/client_glue.c
index 2859da026..cad777112 100644
--- a/lib/kadm5/client_glue.c
+++ b/lib/kadm5/client_glue.c
@@ -38,113 +38,8 @@
 
 #include "kadm5_locl.h"
 
-RCSID("$Id$");
+/* $Id$ */
 
-kadm5_ret_t
-kadm5_chpass_principal(void *server_handle,
-		       krb5_principal princ,
-		       char *password)
-{
-    return kadm5_c_chpass_principal(server_handle, princ, password);
-}
-
-kadm5_ret_t
-kadm5_create_principal(void *server_handle,
-		       kadm5_principal_ent_t princ,
-		       u_int32_t mask,
-		       char *password)
-{
-    return kadm5_c_create_principal(server_handle, princ, mask, password);
-}
-
-kadm5_ret_t
-kadm5_delete_principal(void *server_handle,
-		       krb5_principal princ)
-{
-    return kadm5_c_delete_principal(server_handle, princ);
-}
-
-kadm5_ret_t
-kadm5_destroy (void *server_handle)
-{
-    return kadm5_c_destroy(server_handle);
-}
-
-kadm5_ret_t
-kadm5_flush (void *server_handle)
-{
-    return kadm5_c_flush(server_handle);
-}
-
-kadm5_ret_t
-kadm5_get_principal(void *server_handle,
-		    krb5_principal princ,
-		    kadm5_principal_ent_t out,
-		    u_int32_t mask)
-{
-    return kadm5_c_get_principal(server_handle, princ, out, mask);
-}
-
-kadm5_ret_t
-kadm5_init_with_password(char *client_name,
-			 char *pass,
-			 char *service_name,
-			 kadm5_config_params *realm_params,
-			 unsigned long struct_version,
-			 unsigned long api_version,
-			 void **server_handle)
-{
-    return kadm5_c_init_with_password(client_name,
-				      pass,
-				      service_name,
-				      realm_params,
-				      struct_version,
-				      api_version,
-				      server_handle);
-}
-
-kadm5_ret_t
-kadm5_init_with_password_ctx(krb5_context context,
-			     char *client_name,
-			     char *pass,
-			     char *service_name,
-			     kadm5_config_params *realm_params,
-			     unsigned long struct_version,
-			     unsigned long api_version,
-			     void **server_handle)
-{
-    return kadm5_c_init_with_password_ctx(context,
-					  client_name,
-					  pass,
-					  service_name,
-					  realm_params,
-					  struct_version,
-					  api_version,
-					  server_handle);
-}
-
-kadm5_ret_t
-kadm5_modify_principal(void *server_handle,
-		       kadm5_principal_ent_t princ,
-		       u_int32_t mask)
-{
-    return kadm5_c_modify_principal(server_handle, princ, mask);
-}
-
-kadm5_ret_t
-kadm5_randkey_principal(void *server_handle,
-			krb5_principal princ,
-			krb5_keyblock **new_keys,
-			int *n_keys)
-{
-    return kadm5_c_randkey_principal(server_handle, princ, new_keys, n_keys);
-}
-
-kadm5_ret_t
-kadm5_rename_principal(void *server_handle,
-		       krb5_principal source,
-		       krb5_principal target)
-{
-    return kadm5_c_rename_principal(server_handle, source, target);
-}
+#define __CALL(FUNC) kadm5 ## _c_ ## FUNC
 
+#include "common_glue.c"
diff --git a/lib/kadm5/server_glue.c b/lib/kadm5/server_glue.c
index c46e760a8..0e52afaf3 100644
--- a/lib/kadm5/server_glue.c
+++ b/lib/kadm5/server_glue.c
@@ -38,113 +38,8 @@
 
 #include "kadm5_locl.h"
 
-RCSID("$Id$");
+/* $Id$ */
 
-kadm5_ret_t
-kadm5_chpass_principal(void *server_handle,
-		       krb5_principal princ,
-		       char *password)
-{
-    return kadm5_s_chpass_principal(server_handle, princ, password);
-}
-
-kadm5_ret_t
-kadm5_create_principal(void *server_handle,
-		       kadm5_principal_ent_t princ,
-		       u_int32_t mask,
-		       char *password)
-{
-    return kadm5_s_create_principal(server_handle, princ, mask, password);
-}
-
-kadm5_ret_t
-kadm5_delete_principal(void *server_handle,
-		       krb5_principal princ)
-{
-    return kadm5_s_delete_principal(server_handle, princ);
-}
-
-kadm5_ret_t
-kadm5_destroy (void *server_handle)
-{
-    return kadm5_s_destroy(server_handle);
-}
-
-kadm5_ret_t
-kadm5_flush (void *server_handle)
-{
-    return kadm5_s_flush(server_handle);
-}
-
-kadm5_ret_t
-kadm5_get_principal(void *server_handle,
-		    krb5_principal princ,
-		    kadm5_principal_ent_t out,
-		    u_int32_t mask)
-{
-    return kadm5_s_get_principal(server_handle, princ, out, mask);
-}
-
-kadm5_ret_t
-kadm5_init_with_password(char *client_name,
-			 char *pass,
-			 char *service_name,
-			 kadm5_config_params *realm_params,
-			 unsigned long struct_version,
-			 unsigned long api_version,
-			 void **server_handle)
-{
-    return kadm5_s_init_with_password(client_name,
-				      pass,
-				      service_name,
-				      realm_params,
-				      struct_version,
-				      api_version,
-				      server_handle);
-}
-
-kadm5_ret_t
-kadm5_init_with_password_ctx(krb5_context context,
-			     char *client_name,
-			     char *pass,
-			     char *service_name,
-			     kadm5_config_params *realm_params,
-			     unsigned long struct_version,
-			     unsigned long api_version,
-			     void **server_handle)
-{
-    return kadm5_s_init_with_password_ctx(context,
-					  client_name,
-					  pass,
-					  service_name,
-					  realm_params,
-					  struct_version,
-					  api_version,
-					  server_handle);
-}
-
-kadm5_ret_t
-kadm5_modify_principal(void *server_handle,
-		       kadm5_principal_ent_t princ,
-		       u_int32_t mask)
-{
-    return kadm5_s_modify_principal(server_handle, princ, mask);
-}
-
-kadm5_ret_t
-kadm5_randkey_principal(void *server_handle,
-			krb5_principal princ,
-			krb5_keyblock **new_keys,
-			int *n_keys)
-{
-    return kadm5_s_randkey_principal(server_handle, princ, new_keys, n_keys);
-}
-
-kadm5_ret_t
-kadm5_rename_principal(void *server_handle,
-		       krb5_principal source,
-		       krb5_principal target)
-{
-    return kadm5_s_rename_principal(server_handle, source, target);
-}
+#define __CALL(FUNC) kadm5 ## _s_ ## FUNC
 
+#include "common_glue.c"