diff --git a/src/pam/afs_account.c b/src/pam/afs_account.c
index 173aad4efc..249e343443 100644
--- a/src/pam/afs_account.c
+++ b/src/pam/afs_account.c
@@ -10,7 +10,6 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
diff --git a/src/pam/afs_auth.c b/src/pam/afs_auth.c
index 9cf3a89b6d..09f52148eb 100644
--- a/src/pam/afs_auth.c
+++ b/src/pam/afs_auth.c
@@ -10,17 +10,13 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <syslog.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <sys/param.h>
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
+
 #include <afs/kautils.h>
-#include <signal.h>
-#include <errno.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
diff --git a/src/pam/afs_message.c b/src/pam/afs_message.c
index 51cf826d02..647a7a16d3 100644
--- a/src/pam/afs_message.c
+++ b/src/pam/afs_message.c
@@ -7,22 +7,16 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <syslog.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pwd.h>
-#include <unistd.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
-
-#include <sys/param.h>
 #include <afs/kautils.h>
-#include <stdarg.h>
+
 #include "afs_message.h"
 #include "afs_util.h"
 
diff --git a/src/pam/afs_pam_msg.c b/src/pam/afs_pam_msg.c
index e554612837..bcbbc135a7 100644
--- a/src/pam/afs_pam_msg.c
+++ b/src/pam/afs_pam_msg.c
@@ -10,14 +10,12 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <security/pam_appl.h>
+
 #include "afs_pam_msg.h"
 #include "afs_message.h"
-#include <stdarg.h>
 
 
 int
diff --git a/src/pam/afs_password.c b/src/pam/afs_password.c
index 3bd471ab44..a818772712 100644
--- a/src/pam/afs_password.c
+++ b/src/pam/afs_password.c
@@ -7,26 +7,22 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <syslog.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pwd.h>
-#include <unistd.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
-
-#include <sys/param.h>
 #include <afs/kautils.h>
 #include "afs_message.h"
 #include "afs_util.h"
 #include "afs_pam_msg.h"
-#include <signal.h>
-#include <sys/wait.h>
-#include <errno.h>
 
 #define RET(x) { retcode = (x); goto out; }
 
diff --git a/src/pam/afs_session.c b/src/pam/afs_session.c
index 788e861608..2de18f8c3f 100644
--- a/src/pam/afs_session.c
+++ b/src/pam/afs_session.c
@@ -10,12 +10,7 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
-
-#include <syslog.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
+#include <roken.h>
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
diff --git a/src/pam/afs_setcred.c b/src/pam/afs_setcred.c
index e671f24ed9..e3a83495ec 100644
--- a/src/pam/afs_setcred.c
+++ b/src/pam/afs_setcred.c
@@ -7,21 +7,16 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <syslog.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pwd.h>
-#include <unistd.h>
-#include <errno.h>
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
+
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
 
-
-#include <sys/param.h>
 #include <afs/kautils.h>
+
 #include "afs_message.h"
 #include "afs_util.h"
 
diff --git a/src/pam/afs_util.c b/src/pam/afs_util.c
index c9d1a6f491..d127926723 100644
--- a/src/pam/afs_util.c
+++ b/src/pam/afs_util.c
@@ -7,18 +7,18 @@
  * directory or online at http://www.openafs.org/dl/license10.html
  */
 
-#include <stdio.h>
-#include <assert.h>
-#include <unistd.h>
-#include <errno.h>
-#include <syslog.h>
-#include <security/pam_appl.h>
 #include <afsconfig.h>
 #include <afs/param.h>
+
+#include <roken.h>
+
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
+
+#include <assert.h>
 #include <limits.h>
-#include <string.h>
-#include <stdlib.h>
+
 #ifdef AFS_AIX51_ENV
 #include <sys/cred.h>
 #ifdef HAVE_SYS_PAG_H
@@ -26,6 +26,7 @@
 #endif
 #endif
 
+#include <security/pam_appl.h>
 
 #include "afs_util.h"
 
@@ -50,29 +51,6 @@ nil_cleanup(pam_handle_t * pamh, void *data, int pam_end_status)
     return;
 }
 
-/* The PAM module needs to be free from libucb dependency. Otherwise,
-dynamic linking is a problem, the AFS PAM library refuses to coexist
-with the DCE library. The sigvec() and sigsetmask() are the only two
-calls that neccesiate the inclusion of libucb.a.  There are used by
-the lwp library to support premeptive threads and signalling between
-threads. Since the lwp support used by the PAM module uses none of
-these facilities, we can safely define these to be null functions */
-
-#if !defined(AFS_HPUX110_ENV)
-/* For HP 11.0, this function is in util/hputil.c */
-int
-sigvec(int sig, const struct sigvec *vec, struct sigvec *ovec)
-{
-    assert(0);
-}
-
-int
-sigsetmask(int mask)
-{
-    assert(0);
-}
-#endif /* AFS_HPUX110_ENV */
-
 /* converts string to integer */
 
 char *
diff --git a/src/pam/test_pam.c b/src/pam/test_pam.c
index 6ba4b14376..0665a3c585 100644
--- a/src/pam/test_pam.c
+++ b/src/pam/test_pam.c
@@ -10,13 +10,9 @@
 #include <afsconfig.h>
 #include <afs/param.h>
 
+#include <roken.h>
 
-#include <stdio.h>
 #include <security/pam_appl.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
 
 static int my_conv(int num_msg, PAM_CONST struct pam_message **msg,
 		   struct pam_response **response, void *appdata_ptr);