diff --git a/appl/ftp/common/base64.c b/appl/ftp/common/base64.c
index 85a301e0b..0a660a81e 100644
--- a/appl/ftp/common/base64.c
+++ b/appl/ftp/common/base64.c
@@ -1,6 +1,10 @@
 #include <stdlib.h>
 #include <string.h>
 #include "base64.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+RCSID("$Id$");
+#endif
 
 static char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
diff --git a/appl/ftp/common/base64.h b/appl/ftp/common/base64.h
index e4e7934e7..e710c4329 100644
--- a/appl/ftp/common/base64.h
+++ b/appl/ftp/common/base64.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef _BASE64_H_
 #define _BASE64_H_
 
diff --git a/appl/ftp/common/common.h b/appl/ftp/common/common.h
index 0efa0d3bd..ddd9ba5cf 100644
--- a/appl/ftp/common/common.h
+++ b/appl/ftp/common/common.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/appl/ftp/ftp/cmds.c b/appl/ftp/ftp/cmds.c
index bb6f2c718..8ccfbf8ab 100644
--- a/appl/ftp/ftp/cmds.c
+++ b/appl/ftp/ftp/cmds.c
@@ -38,6 +38,7 @@
  */
 
 #include "ftp_locl.h"
+RCSID("$Id$");
 
 typedef void (*sighand)(int);
 
diff --git a/appl/ftp/ftp/domacro.c b/appl/ftp/ftp/domacro.c
index f6662bb49..e8d32a1e6 100644
--- a/appl/ftp/ftp/domacro.c
+++ b/appl/ftp/ftp/domacro.c
@@ -34,6 +34,7 @@
  */
 
 #include "ftp_locl.h"
+RCSID("$Id$");
 
 void
 domacro(int argc, char **argv)
diff --git a/appl/ftp/ftp/extern.h b/appl/ftp/ftp/extern.h
index 4e64fd189..7c0c24eec 100644
--- a/appl/ftp/ftp/extern.h
+++ b/appl/ftp/ftp/extern.h
@@ -35,6 +35,8 @@
  *	@(#)extern.h	8.3 (Berkeley) 10/9/94
  */
 
+/* $Id$ */
+
 #include <setjmp.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c
index bae110f6f..910d59cb2 100644
--- a/appl/ftp/ftp/ftp.c
+++ b/appl/ftp/ftp/ftp.c
@@ -34,6 +34,7 @@
  */
 
 #include "ftp_locl.h"
+RCSID("$Id$");
 
 #ifndef INADDR_NONE
 #define INADDR_NONE 0xffffffff
diff --git a/appl/ftp/ftp/globals.c b/appl/ftp/ftp/globals.c
index b1ab973f2..d51ffeef8 100644
--- a/appl/ftp/ftp/globals.c
+++ b/appl/ftp/ftp/globals.c
@@ -1,4 +1,5 @@
 #include "ftp_locl.h"
+RCSID("$Id$");
 
 /*
  * Options and other state info.
diff --git a/appl/ftp/ftp/krb4.h b/appl/ftp/ftp/krb4.h
index 5633dba58..fd545badd 100644
--- a/appl/ftp/ftp/krb4.h
+++ b/appl/ftp/ftp/krb4.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __KRB4_H__
 #define __KRB4_H__
 
diff --git a/appl/ftp/ftp/main.c b/appl/ftp/ftp/main.c
index 2da43dd03..e1ce9da68 100644
--- a/appl/ftp/ftp/main.c
+++ b/appl/ftp/ftp/main.c
@@ -36,6 +36,7 @@
  */
 
 #include "ftp_locl.h"
+RCSID("$Id$");
 
 int
 main(int argc, char **argv)
diff --git a/appl/ftp/ftp/ruserpass.c b/appl/ftp/ftp/ruserpass.c
index 670d0af1a..95f3b5f3a 100644
--- a/appl/ftp/ftp/ruserpass.c
+++ b/appl/ftp/ftp/ruserpass.c
@@ -34,6 +34,7 @@
  */
 
 #include "ftp_locl.h"
+RCSID("$Id$");
 
 static	int token __P((void));
 static	FILE *cfile;
diff --git a/appl/ftp/ftpd/auth.c b/appl/ftp/ftpd/auth.c
index d9554f4d6..495b0d433 100644
--- a/appl/ftp/ftpd/auth.c
+++ b/appl/ftp/ftpd/auth.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include <sys/types.h>
diff --git a/appl/ftp/ftpd/auth.h b/appl/ftp/ftpd/auth.h
index 3fa2f7d0e..ccc4fc21a 100644
--- a/appl/ftp/ftpd/auth.h
+++ b/appl/ftp/ftpd/auth.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __AUTH_H__
 #define __AUTH_H__
 
diff --git a/appl/ftp/ftpd/krb4.c b/appl/ftp/ftpd/krb4.c
index 2348a4dde..5ec1c4b3c 100644
--- a/appl/ftp/ftpd/krb4.c
+++ b/appl/ftp/ftpd/krb4.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include <sys/types.h>
diff --git a/appl/ftp/ftpd/krb4.h b/appl/ftp/ftpd/krb4.h
index bff19abef..68c46909c 100644
--- a/appl/ftp/ftpd/krb4.h
+++ b/appl/ftp/ftpd/krb4.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __KRB4_H__
 #define __KRB4_H__
 
diff --git a/lib/roken/err.c b/lib/roken/err.c
index 0f567f5bc..7ed9fe092 100644
--- a/lib/roken/err.c
+++ b/lib/roken/err.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 err(int eval, const char *fmt, ...)
 {
diff --git a/lib/roken/err.h b/lib/roken/err.h
index 40c08de8e..f84a16c0f 100644
--- a/lib/roken/err.h
+++ b/lib/roken/err.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __ERR_H__
 #define __ERR_H__
 
diff --git a/lib/roken/err.hin b/lib/roken/err.hin
index 40c08de8e..f84a16c0f 100644
--- a/lib/roken/err.hin
+++ b/lib/roken/err.hin
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __ERR_H__
 #define __ERR_H__
 
diff --git a/lib/roken/errx.c b/lib/roken/errx.c
index 6b3b5a8a1..b70dc91c5 100644
--- a/lib/roken/errx.c
+++ b/lib/roken/errx.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 errx(int eval, const char *fmt, ...)
 {
diff --git a/lib/roken/getdtablesize.c b/lib/roken/getdtablesize.c
index fdeee76a4..39d3d004e 100644
--- a/lib/roken/getdtablesize.c
+++ b/lib/roken/getdtablesize.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "roken.h"
diff --git a/lib/roken/hstrerror.c b/lib/roken/hstrerror.c
index 2839a0402..7c74123ec 100644
--- a/lib/roken/hstrerror.c
+++ b/lib/roken/hstrerror.c
@@ -1,13 +1,12 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "roken.h"
 
 #ifndef HAVE_HSTRERROR
 
-RCSID("$Id$");
-
 #include <stdio.h>
 #include <netdb.h>
 
diff --git a/lib/roken/inet_aton.c b/lib/roken/inet_aton.c
index 8c66f59e2..1441ea478 100644
--- a/lib/roken/inet_aton.c
+++ b/lib/roken/inet_aton.c
@@ -1,5 +1,6 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "roken.h"
@@ -9,8 +10,6 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-RCSID("$Id$");
-
 /* Minimal implementation of inet_aton. Doesn't handle hex numbers. */
 
 int inet_aton(const char *cp, struct in_addr *adr)
diff --git a/lib/roken/memmove.c b/lib/roken/memmove.c
index 8604af68a..983e1b90e 100644
--- a/lib/roken/memmove.c
+++ b/lib/roken/memmove.c
@@ -7,12 +7,11 @@
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include <sys/types.h>
 
-RCSID("$Id$");
-
 void* memmove(void *s1, const void *s2, size_t n)
 {
   char *s=(char*)s2, *d=(char*)s1;
diff --git a/lib/roken/putenv.c b/lib/roken/putenv.c
index 836d7dd96..637139e9d 100644
--- a/lib/roken/putenv.c
+++ b/lib/roken/putenv.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include <stdlib.h>
 
-RCSID("$Id$");
-
 extern char **environ;
 
 /*
diff --git a/lib/roken/setegid.c b/lib/roken/setegid.c
index 73ec5bc63..88e595e32 100644
--- a/lib/roken/setegid.c
+++ b/lib/roken/setegid.c
@@ -1,6 +1,7 @@
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-
 RCSID("$Id$");
+#endif
 
 int
 setegid(int egid)
diff --git a/lib/roken/setenv.c b/lib/roken/setenv.c
index 4b3449fc2..be7b585d1 100644
--- a/lib/roken/setenv.c
+++ b/lib/roken/setenv.c
@@ -1,8 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 RCSID("$Id$");
+#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/seteuid.c b/lib/roken/seteuid.c
index 37f1240a5..671aa6e5b 100644
--- a/lib/roken/seteuid.c
+++ b/lib/roken/seteuid.c
@@ -1,6 +1,7 @@
+#ifdef HAVE_CONFIG_H
 #include <config.h>
-
 RCSID("$Id$");
+#endif
 
 int
 seteuid(int euid)
diff --git a/lib/roken/signal.c b/lib/roken/signal.c
index 6bf272cdb..4b868ba47 100644
--- a/lib/roken/signal.c
+++ b/lib/roken/signal.c
@@ -1,8 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 RCSID("$Id$");
+#endif
 
 #include <signal.h>
 
diff --git a/lib/roken/strdup.c b/lib/roken/strdup.c
index c9377ef4a..9bc9019ea 100644
--- a/lib/roken/strdup.c
+++ b/lib/roken/strdup.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 #include <stdlib.h>
 #include <string.h>
 
-RCSID("$Id$");
-
 #ifndef HAVE_STRDUP
 char *
 strdup(const char *old)
diff --git a/lib/roken/strerror.c b/lib/roken/strerror.c
index 8d145ed6e..d05cb569b 100644
--- a/lib/roken/strerror.c
+++ b/lib/roken/strerror.c
@@ -1,12 +1,11 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include <errno.h>
 #include <string.h>
 
-RCSID("$Id$");
-
 extern int sys_nerr;
 extern char *sys_errlist[];
 
diff --git a/lib/roken/unsetenv.c b/lib/roken/unsetenv.c
index 685aefc72..709e2d433 100644
--- a/lib/roken/unsetenv.c
+++ b/lib/roken/unsetenv.c
@@ -1,8 +1,7 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
 RCSID("$Id$");
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/roken/verify.c b/lib/roken/verify.c
index a42fe67f9..eaf754d4d 100644
--- a/lib/roken/verify.c
+++ b/lib/roken/verify.c
@@ -3,7 +3,6 @@
 RCSID("$Id$");
 #endif
 
-
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/roken/verr.c b/lib/roken/verr.c
index 3c7348d8c..c1e632d1d 100644
--- a/lib/roken/verr.c
+++ b/lib/roken/verr.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 verr(int eval, const char *fmt, va_list ap)
 {
diff --git a/lib/roken/verrx.c b/lib/roken/verrx.c
index 493acb63e..d79d300ee 100644
--- a/lib/roken/verrx.c
+++ b/lib/roken/verrx.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 verrx(int eval, const char *fmt, va_list ap)
 {
diff --git a/lib/roken/vwarn.c b/lib/roken/vwarn.c
index ebef09006..89f840bc6 100644
--- a/lib/roken/vwarn.c
+++ b/lib/roken/vwarn.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 vwarn(const char *fmt, va_list ap)
 {
diff --git a/lib/roken/vwarnx.c b/lib/roken/vwarnx.c
index 6d1a452f8..8584eeb12 100644
--- a/lib/roken/vwarnx.c
+++ b/lib/roken/vwarnx.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 vwarnx(const char *fmt, va_list ap)
 {
diff --git a/lib/roken/warn.c b/lib/roken/warn.c
index dec5abf48..3fb84a981 100644
--- a/lib/roken/warn.c
+++ b/lib/roken/warn.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 warn(const char *fmt, ...)
 {
diff --git a/lib/roken/warnx.c b/lib/roken/warnx.c
index ef8bfec2d..79ec7fff8 100644
--- a/lib/roken/warnx.c
+++ b/lib/roken/warnx.c
@@ -1,11 +1,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
+RCSID("$Id$");
 #endif
 
 #include "err.h"
 
-RCSID("$Id$");
-
 void
 warnx(const char *fmt, ...)
 {