diff --git a/check.c b/check.c
index 2cdf67281..883b4daef 100644
--- a/check.c
+++ b/check.c
@@ -35,10 +35,6 @@
  *  Jeff Nieusma  Thu Mar 21 22:39:07 MST 1991
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -97,6 +93,9 @@ static const char rcsid[] = "$Id$";
 #include "insults.h"
 #include "version.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 /*
  * Prototypes for local functions
diff --git a/check_sia.c b/check_sia.c
index 1bf69dc9f..67ff6ab72 100644
--- a/check_sia.c
+++ b/check_sia.c
@@ -25,10 +25,6 @@
  *  Spider Boardman Sep 26, 1998
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #ifdef HAVE_SIA
@@ -54,6 +50,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Prototypes for local functions
  */
diff --git a/find_path.c b/find_path.c
index 85cf8c898..d9c9d3f3d 100644
--- a/find_path.c
+++ b/find_path.c
@@ -28,10 +28,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Mar 25 21:50:36 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -72,7 +68,6 @@ extern char *strdup	__P((const char *));
 #endif /* HAVE_STRDUP */
 #endif /* !STDC_HEADERS */
 
-
 #ifndef _S_IFMT
 #define _S_IFMT		S_IFMT
 #endif /* _S_IFMT */
@@ -80,6 +75,9 @@ extern char *strdup	__P((const char *));
 #define _S_IFLNK	S_IFLNK
 #endif /* _S_IFLNK */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 /*******************************************************************
  *
diff --git a/getcwd.c b/getcwd.c
index 2a3e9e983..503925f04 100644
--- a/getcwd.c
+++ b/getcwd.c
@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: getcwd.c,v 1.5 1998/08/14 21:39:26 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
 #include "config.h"
 
 #include <sys/param.h>
@@ -80,6 +76,10 @@ static const char rcsid[] = "$OpenBSD: getcwd.c,v 1.5 1998/08/14 21:39:26 deraad
 	(dp->d_name[0] == '.' && (dp->d_name[1] == '\0' || \
 	    (dp->d_name[1] == '.' && dp->d_name[2] == '\0')))
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char rcsid[] = "$OpenBSD: getcwd.c,v 1.5 1998/08/14 21:39:26 deraadt Exp $";
+#endif /* LIBC_SCCS and not lint */
+
 char *
 getcwd(pt, size)
 	char *pt;
diff --git a/getspwuid.c b/getspwuid.c
index 20123b5ae..29fdb09f0 100644
--- a/getspwuid.c
+++ b/getspwuid.c
@@ -27,10 +27,6 @@
  *  Todd C. Miller  Mon Nov 20 13:53:06 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -73,6 +69,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 #ifndef STDC_HEADERS
 #ifndef __GNUC__                /* gcc has its own malloc */
 extern char *malloc     __P((size_t));
diff --git a/goodpath.c b/goodpath.c
index 510269ca6..aed31cc39 100644
--- a/goodpath.c
+++ b/goodpath.c
@@ -28,10 +28,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Mar 25 21:58:17 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -56,6 +52,9 @@ static const char rcsid[] = "$Id$";
 extern int stat		__P((const char *, struct stat *));
 #endif /* !STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 /******************************************************************
  *
diff --git a/interfaces.c b/interfaces.c
index 8d0e0b0b8..48b50c3cd 100644
--- a/interfaces.c
+++ b/interfaces.c
@@ -26,10 +26,6 @@
  *  Todd C. Miller  Mon May  1 20:48:43 MDT 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -53,11 +49,7 @@ static const char rcsid[] = "$Id$";
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/param.h>
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
-#else
 #include <sys/ioctl.h>
-#endif /* HAVE_SYS_SOCKIO_H */
 #ifdef _ISC
 #include <sys/stream.h>
 #include <sys/sioctl.h>
@@ -83,6 +75,10 @@ extern char *malloc	__P((size_t));
 extern char *realloc	__P((VOID *, size_t));
 #endif /* !STDC_HEADERS && !__GNUC__ */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */
diff --git a/logging.c b/logging.c
index 0b3d87665..692a9136f 100644
--- a/logging.c
+++ b/logging.c
@@ -36,10 +36,6 @@
  *  Jeff Nieusma   Thu Mar 21 23:39:04 MST 1991
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -70,6 +66,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Prototypes for local functions
  */
diff --git a/lsearch.c b/lsearch.c
index 3e07ff3f7..7de302ba2 100644
--- a/lsearch.c
+++ b/lsearch.c
@@ -34,13 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lsearch.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -52,6 +45,12 @@ static const char rcsid[] = "$Id$";
 #include "compat.h"
 #include "emul/search.h"
 
+#if defined(LIBC_SCCS) && !defined(lint)
+static const char sccsid[] = "@(#)lsearch.c	8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
 
 typedef int (*cmp_fn_t) __P((const VOID *, const VOID *));
 static VOID *linear_base __P((const VOID *, const VOID *, size_t *, size_t,
diff --git a/parse.c b/parse.c
index 52893cdcb..876190713 100644
--- a/parse.c
+++ b/parse.c
@@ -24,10 +24,6 @@
  * Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -84,6 +80,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */
diff --git a/parse.lex b/parse.lex
index d8e205de5..3011d5b7d 100644
--- a/parse.lex
+++ b/parse.lex
@@ -25,10 +25,6 @@
  * Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #ifdef STDC_HEADERS
@@ -50,6 +46,10 @@ static const char rcsid[] = "$Id$";
 #include "sudo.h"
 #include "sudo.tab.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 #undef yywrap		/* guard against a yywrap macro */
 
 extern YYSTYPE yylval;
diff --git a/parse.yacc b/parse.yacc
index 089152ab0..4d11f6dc1 100644
--- a/parse.yacc
+++ b/parse.yacc
@@ -26,10 +26,6 @@
  * Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 #include <stdio.h>
 #ifdef STDC_HEADERS
@@ -65,6 +61,10 @@ static const char rcsid[] = "$Id$";
 #define strcasecmp(a,b)		strcmp(a,b)
 #endif /* !HAVE_STRCASECMP */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */
diff --git a/putenv.c b/putenv.c
index 1c791d725..765f98411 100644
--- a/putenv.c
+++ b/putenv.c
@@ -24,10 +24,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sun Aug  7 20:30:17 MDT 1994
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -50,6 +46,10 @@ static const char rcsid[] = "$Id$";
 extern char *malloc	__P((size_t));
 #endif /* !STDC_HEADERS && !gcc */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *
diff --git a/secureware.c b/secureware.c
index bafce86cc..7d80d035c 100644
--- a/secureware.c
+++ b/secureware.c
@@ -24,10 +24,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Oct 17 14:42:44 MDT 1998
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #ifdef HAVE_GETPRPWNAM
@@ -58,6 +54,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /********************************************************************
  *
diff --git a/strdup.c b/strdup.c
index c4d00af9e..2d9835066 100644
--- a/strdup.c
+++ b/strdup.c
@@ -32,10 +32,6 @@
  *  Jeff Nieusma  Thu Mar 21 23:11:23 MST 1991
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -61,6 +57,10 @@ extern char *malloc	__P((size_t));
 extern char *strcpy	__P((char *, const char *));
 #endif /* !STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *
diff --git a/sudo.c b/sudo.c
index c99018fc2..3d78c0e0e 100644
--- a/sudo.c
+++ b/sudo.c
@@ -50,10 +50,6 @@
  *		Todd Miller  <Todd.Miller@courtesan.com>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #define MAIN
 
 #include "config.h"
@@ -99,6 +95,10 @@ extern char *strdup	__P((const char *));
 extern char *getenv	__P((char *));
 #endif /* STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /*
  * Local type declarations
diff --git a/sudo_setenv.c b/sudo_setenv.c
index 54f1bbdf5..97a9bd546 100644
--- a/sudo_setenv.c
+++ b/sudo_setenv.c
@@ -25,10 +25,6 @@
  *  Todd C. Miller (millert@colorado.edu) Fri Jun  3 18:32:19 MDT 1994
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -56,6 +52,10 @@ extern int setenv	__P((char *, char *, int));
 #endif /* HAVE_SETENV */
 #endif /* !STDC_HEADERS */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /**********************************************************************
  *
diff --git a/testsudoers.c b/testsudoers.c
index a70b49595..01a14202b 100644
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -24,10 +24,6 @@
  *  Chris Jepeway <jepeway@cs.utk.edu>
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -68,6 +64,10 @@ static const char rcsid[] = "$Id$";
 
 #include "sudo.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Globals
  */
diff --git a/tgetpass.c b/tgetpass.c
index 8a71f59f5..11bca9dee 100644
--- a/tgetpass.c
+++ b/tgetpass.c
@@ -26,10 +26,6 @@
  *  Todd C. Miller  Sun Jun  5 17:22:31 MDT 1994
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -85,6 +81,10 @@ static const char rcsid[] = "$Id$";
 #define TCSASOFT	0
 #endif /* TCSASOFT */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *
diff --git a/utime.c b/utime.c
index e87f4d1c6..9ce675869 100644
--- a/utime.c
+++ b/utime.c
@@ -26,10 +26,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Jun 17 16:42:41 MDT 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -43,6 +39,10 @@ static const char rcsid[] = "$Id$";
 #include "compat.h"
 #include "emul/utime.h"
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 
 /******************************************************************
  *
diff --git a/visudo.c b/visudo.c
index 2d3f966fc..8e67bf5a7 100644
--- a/visudo.c
+++ b/visudo.c
@@ -25,10 +25,6 @@
  *  Todd C. Miller (millert@colorado.edu) Sat Mar 25 21:50:36 MST 1995
  */
 
-#ifndef lint
-static const char rcsid[] = "$Id$";
-#endif /* lint */
-
 #include "config.h"
 
 #include <stdio.h>
@@ -73,6 +69,10 @@ extern int stat		__P((const char *, struct stat *));
 #define SA_RESETHAND    0
 #endif /* POSIX_SIGNALS && !SA_RESETHAND */
 
+#ifndef lint
+static const char rcsid[] = "$Id$";
+#endif /* lint */
+
 /*
  * Function prototypes
  */