diff --git a/src/cpu/p5/cpuid.c b/src/cpu/p5/cpuid.c
index 031336c197..71943be070 100644
--- a/src/cpu/p5/cpuid.c
+++ b/src/cpu/p5/cpuid.c
@@ -1,3 +1,8 @@
+
+#ifndef lint
+static char rcsid[] = "$Id$";
+#endif
+
 #include <pciconf.h>
 #include <subr.h>
 #include <printk.h>
diff --git a/src/cpu/p6/l2_cache.c b/src/cpu/p6/l2_cache.c
index 87ba086a6a..649a5cd654 100644
--- a/src/cpu/p6/l2_cache.c
+++ b/src/cpu/p6/l2_cache.c
@@ -28,6 +28,11 @@
  * Intel Architecture Software Developer's Manual
  * Volume 3: System Programming
  */
+
+#ifndef lint
+static char rcsid[] = "$Id$";
+#endif
+
 #include <cpu/p6/msr.h>
 #include <cpu/p6/mtrr.h>
 #include <cpu/p5/cpuid.h>
diff --git a/src/cpu/p6/microcode.c b/src/cpu/p6/microcode.c
index a15217be86..4364c5e054 100644
--- a/src/cpu/p6/microcode.c
+++ b/src/cpu/p6/microcode.c
@@ -1,3 +1,12 @@
+/* microcode.c:	Microcode update for PIII and later CPUS
+ *
+ * $Id$
+ */
+
+#ifndef lint
+static char rcsid[] = "$Id$";
+#endif
+
 #include <pciconf.h>
 #include <subr.h>
 #include <cpu/p6/msr.h>
diff --git a/src/cpu/p6/mtrr.c b/src/cpu/p6/mtrr.c
index 8d6834f1da..2df8f6d965 100644
--- a/src/cpu/p6/mtrr.c
+++ b/src/cpu/p6/mtrr.c
@@ -25,6 +25,10 @@
  * $Id$
  */
 
+#ifndef lint
+static char rcsid[] = "$Id$";
+#endif
+
 #include <cpu/p6/msr.h>
 #include <cpu/p6/mtrr.h>
 #include <printk.h>
@@ -134,6 +138,7 @@ void intel_set_var_mtrr(unsigned int reg, unsigned long base, unsigned long size
 		      "wbinvd\n\t"
 		      "movl  %0, %%cr0\n\t"
 		      "wbinvd\n\t":"=r" (tmp)::"memory");
+
 	if (size == 0) {
 		/* The invalid bit is kept in the mask, so we simply clear the
 		   relevant mask register to disable a range. */
@@ -144,7 +149,6 @@ void intel_set_var_mtrr(unsigned int reg, unsigned long base, unsigned long size
 	}
 
 	// turn cache back on. 
-
 	asm volatile ("movl  %%cr0, %0\n\t"
 		      "andl  $0x9fffffff, %0\n\t"
 		      "movl  %0, %%cr0\n\t":"=r" (tmp)::"memory");
diff --git a/src/lib/linuxpci.c b/src/lib/linuxpci.c
index 597c71f77b..896b71f00b 100644
--- a/src/lib/linuxpci.c
+++ b/src/lib/linuxpci.c
@@ -9,10 +9,10 @@
  *      Copyright 1997 -- 1999 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
  */
 
-/* the intent of this file is to easily copy any new pci.c from the 
- * linux source tree, so keep your mods to a minimum, please
- * RGM
- */
+#ifndef lint
+static char rcsid[] = "$Id$";
+#endif
+
 #include <pci.h>
 #include <pci_ids.h>
 #include <cpu/p5/io.h>
diff --git a/src/lib/newpci.c b/src/lib/newpci.c
index 0cd53b6f83..900f031f68 100644
--- a/src/lib/newpci.c
+++ b/src/lib/newpci.c
@@ -27,6 +27,10 @@
 #define PCI_MEM_START 0x80000000
 #define PCI_IO_START 0x1000
 
+#ifndef lint
+static char rcsid[] = "$Id$";
+#endif
+
 // historical functions, sometimes very useful. 
 /*
  *    Write the special configuration registers on the INTEL