diff -ur shadow-4.0.7-orig/src/groupdel.c shadow-4.0.7/src/groupdel.c
--- shadow-4.0.7-orig/src/groupdel.c	2006-01-12 00:52:48.000000000 +0000
+++ shadow-4.0.7/src/groupdel.c	2006-01-12 01:17:35.000000000 +0000
@@ -37,14 +37,15 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include "nscd.h"
+#include "prototypes.h"
+#include "defines.h"
 #ifdef USE_PAM
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #include <pwd.h>
 #endif				/* USE_PAM */
-#include "nscd.h"
-#include "prototypes.h"
-#include "defines.h"
+
 static char *group_name;
 static char *Prog;
 static int errors;
diff -ur shadow-4.0.7-orig/src/groupmod.c shadow-4.0.7/src/groupmod.c
--- shadow-4.0.7-orig/src/groupmod.c	2006-01-12 00:52:48.000000000 +0000
+++ shadow-4.0.7/src/groupmod.c	2006-01-12 01:18:02.000000000 +0000
@@ -36,14 +36,14 @@
 #include <grp.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include "prototypes.h"
+#include "chkname.h"
+#include "defines.h"
 #ifdef USE_PAM
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #include <pwd.h>
 #endif				/* USE_PAM */
-#include "prototypes.h"
-#include "chkname.h"
-#include "defines.h"
 #include "groupio.h"
 #include "nscd.h"
 #ifdef	SHADOWGRP
diff -ur shadow-4.0.7-orig/src/su.c shadow-4.0.7/src/su.c
--- shadow-4.0.7-orig/src/su.c	2006-01-12 00:52:48.000000000 +0000
+++ shadow-4.0.7/src/su.c	2006-01-12 01:16:51.000000000 +0000
@@ -33,6 +33,10 @@
 RCSID (PKG_VER "$Id: su.c,v 1.28 2004/11/09 03:57:36 kloczek Exp $")
 #include <sys/types.h>
 #include <stdio.h>
+
+#include "prototypes.h"
+#include "defines.h"
+
 #ifdef USE_PAM
 #include "pam_defs.h"
 static const struct pam_conv conv = {
@@ -43,8 +47,6 @@
 static pam_handle_t *pamh = NULL;
 #endif
 
-#include "prototypes.h"
-#include "defines.h"
 
 #include <grp.h>
 #include <signal.h>
diff -ur shadow-4.0.7-orig/src/userdel.c shadow-4.0.7/src/userdel.c
--- shadow-4.0.7-orig/src/userdel.c	2006-01-12 00:52:48.000000000 +0000
+++ shadow-4.0.7/src/userdel.c	2006-01-12 01:18:19.000000000 +0000
@@ -38,13 +38,14 @@
 #include <grp.h>
 #include <ctype.h>
 #include <fcntl.h>
+#include "prototypes.h"
+#include "defines.h"
 #ifdef USE_PAM
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #include <pwd.h>
 #endif				/* USE_PAM */
-#include "prototypes.h"
-#include "defines.h"
+
 #include "getdef.h"
 #include "pwauth.h"
 #include "nscd.h"
diff -ur shadow-4.0.7-orig/src/usermod.c shadow-4.0.7/src/usermod.c
--- shadow-4.0.7-orig/src/usermod.c	2006-01-12 00:52:48.000000000 +0000
+++ shadow-4.0.7/src/usermod.c	2006-01-12 01:18:32.000000000 +0000
@@ -40,13 +40,14 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <time.h>
+#include "prototypes.h"
+#include "defines.h"
 #ifdef USE_PAM
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 #include <pwd.h>
 #endif				/* USE_PAM */
-#include "prototypes.h"
-#include "defines.h"
+
 #include "chkname.h"
 #include "faillog.h"
 #if HAVE_LASTLOG_H