diff --git a/arch/x86/macros.h b/arch/x86/macros.h
index e1822ef97a..8c12c1c805 100644
--- a/arch/x86/macros.h
+++ b/arch/x86/macros.h
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef X86_MACROS_H
-#define X86_MACROS_H 1
+#ifndef ARCH_X86_MACROS_H
+#define ARCH_X86_MACROS_H
 
 #define port80_post(value)	\
 	movb	$value, %al;	\
 	outb	%al, $0x80
 
-#endif
+#endif /* ARCH_X86_MACROS_H */
diff --git a/arch/x86/mtrr.h b/arch/x86/mtrr.h
index f16de3cc9d..61568edeb6 100644
--- a/arch/x86/mtrr.h
+++ b/arch/x86/mtrr.h
@@ -1,5 +1,5 @@
-#ifndef CPU_X86_MTRR_H
-#define CPU_X86_MTRR_H
+#ifndef ARCH_X86_MTRR_H
+#define ARCH_X86_MTRR_H
 
 /*  These are the region types  */
 #define MTRR_TYPE_UNCACHEABLE 0
@@ -38,4 +38,4 @@ int x86_mtrr_check(void);
 
 #endif
 
-#endif				/* CPU_X86_MTRR_H */
+#endif				/* ARCH_X86_MTRR_H */
diff --git a/include/arch/x86/archelf.h b/include/arch/x86/archelf.h
index 2389888a8c..baea0ddd18 100644
--- a/include/arch/x86/archelf.h
+++ b/include/arch/x86/archelf.h
@@ -1,8 +1,8 @@
-#ifndef CPU_GENERIC_X86_ARCH_ELF_H
-#define CPU_GENERIC_X86_ARCH_ELF_H
+#ifndef ARCH_X86_ARCHELF_H
+#define ARCH_X86_ARCHELF_H
 
 #define ELF_CLASS	ELFCLASS32
 #define ELF_DATA	ELFDATA2LSB
 #define ELF_ARCH	EM_386
 
-#endif /* CPU_GENERIC_X86_ARCH_ELF_H */
+#endif /* ARCH_X86_ARCHELF_H */
diff --git a/include/arch/x86/byteorder.h b/include/arch/x86/byteorder.h
index aec4861e24..a234d754e3 100644
--- a/include/arch/x86/byteorder.h
+++ b/include/arch/x86/byteorder.h
@@ -14,8 +14,9 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
-#ifndef _BYTEORDER_H
-#define _BYTEORDER_H
+
+#ifndef ARCH_X86_BYTEORDER_H
+#define ARCH_X86_BYTEORDER_H
 
 #define __LITTLE_ENDIAN 1234
 
@@ -30,4 +31,4 @@
 #define cpu_to_be16(x) swab16((x))
 #define be16_to_cpu(x) swab16((x))
 
-#endif /* _BYTEORDER_H */
+#endif /* ARCH_X86_BYTEORDER_H */
diff --git a/include/arch/x86/div64.h b/include/arch/x86/div64.h
index 996b95768d..2764073822 100644
--- a/include/arch/x86/div64.h
+++ b/include/arch/x86/div64.h
@@ -4,8 +4,8 @@
  * It was taken from the Linux kernel, include/asm-i386/div64.h.
  */
 
-#ifndef __I386_DIV64
-#define __I386_DIV64
+#ifndef ARCH_X86_DIV64_H
+#define ARCH_X86_DIV64_H
 
 /*
  * do_div() is NOT a C function. It wants to return
@@ -51,4 +51,5 @@ div_ll_X_l_rem(long long divs, long div, long *rem)
 	return dum2;
 
 }
-#endif
+
+#endif /* ARCH_X86_DIV64_H */
diff --git a/include/arch/x86/hlt.h b/include/arch/x86/hlt.h
index b296000592..7fa813fac6 100644
--- a/include/arch/x86/hlt.h
+++ b/include/arch/x86/hlt.h
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef ARCH_HLT_H
-#define ARCH_HLT_H
+#ifndef ARCH_X86_HLT_H
+#define ARCH_X86_HLT_H
 
 static inline __attribute__((always_inline)) void hlt(void)
 {
 	asm("hlt");
 }
 
-#endif
+#endif /* ARCH_X86_HLT_H */
diff --git a/include/arch/x86/io.h b/include/arch/x86/io.h
index 5331c2ace1..c80ab65580 100644
--- a/include/arch/x86/io.h
+++ b/include/arch/x86/io.h
@@ -14,8 +14,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef _ARCH_IO_H
-#define _ARCH_IO_H
+#ifndef ARCH_X86_IO_H
+#define ARCH_X86_IO_H
 
 #include <types.h>
 
@@ -147,5 +147,4 @@ static inline u32 readl(const volatile void *addr)
 	return *(volatile u32 *) addr;
 }
 
-#endif
-
+#endif /* ARCH_X86_IO_H */
diff --git a/include/arch/x86/pci_ops.h b/include/arch/x86/pci_ops.h
index 9f195c6326..816617fb99 100644
--- a/include/arch/x86/pci_ops.h
+++ b/include/arch/x86/pci_ops.h
@@ -13,8 +13,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
-#ifndef ARCH_I386_PCI_OPS_H
-#define ARCH_I386_PCI_OPS_H
+
+#ifndef ARCH_X86_PCI_OPS_H
+#define ARCH_X86_PCI_OPS_H
 
 extern struct pci_bus_operations pci_cf8_conf1;
 extern struct pci_bus_operations pci_cf8_conf2;
@@ -25,4 +26,4 @@ extern struct pci_bus_operations pci_ops_mmconf;
 
 void pci_set_method(struct device * dev);
 
-#endif /* ARCH_I386_PCI_OPS_H */
+#endif /* ARCH_X86_PCI_OPS_H */
diff --git a/include/arch/x86/pciconf.h b/include/arch/x86/pciconf.h
index 9971552222..e66e611441 100644
--- a/include/arch/x86/pciconf.h
+++ b/include/arch/x86/pciconf.h
@@ -1,3 +1,6 @@
+#ifndef ARCH_X86_PCICONF_H
+#define ARCH_X86_PCICONF_H
+
 #ifndef PCI_CONF_REG_INDEX
 
 // These are defined in the PCI spec, and hence are theoretically
@@ -15,3 +18,5 @@
 #endif
 #define CONFIG_ADDR(bus,devfn,where) (((bus) << 16) | ((devfn) << 8) | (where))
 #endif
+
+#endif /* ARCH_X86_PCICONF_H */
diff --git a/include/arch/x86/swab.h b/include/arch/x86/swab.h
index 372b5865c4..e53e8a07fa 100644
--- a/include/arch/x86/swab.h
+++ b/include/arch/x86/swab.h
@@ -4,8 +4,8 @@
  * It is based on include/linux/byteorder/swab.h from the Linux kernel.
  */
 
-#ifndef _SWAB_H
-#define _SWAB_H
+#ifndef ARCH_X86_SWAB_H
+#define ARCH_X86_SWAB_H
 
 /*
  * linux/byteorder/swab.h
@@ -36,4 +36,4 @@
 		(((unsigned int)(x) & (unsigned int)0x00ff0000UL) >>  8) | \
 		(((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) ))
 
-#endif /* _SWAB_H */
+#endif /* ARCH_X86_SWAB_H */
diff --git a/include/arch/x86/types.h b/include/arch/x86/types.h
index b217992c42..07882bc8b1 100644
--- a/include/arch/x86/types.h
+++ b/include/arch/x86/types.h
@@ -2,8 +2,8 @@
  * Generic data types.
  */
 
-#ifndef _ARCH_TYPES_H
-#define _ARCH_TYPES_H
+#ifndef ARCH_X86_TYPES_H
+#define ARCH_X86_TYPES_H
 
 typedef unsigned long long u64;
 typedef unsigned int u32;
@@ -19,4 +19,4 @@ typedef long unsigned int size_t;
 
 #define NULL ((void *)0)
 
-#endif
+#endif /* ARCH_X86_TYPES_H */
diff --git a/include/console.h b/include/console.h
index 2b209f8735..08c9dc8ea8 100644
--- a/include/console.h
+++ b/include/console.h
@@ -14,8 +14,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef CONSOLE_CONSOLE_H_
-#define CONSOLE_CONSOLE_H_
+#ifndef CONSOLE_H
+#define CONSOLE_H
 
 #include <types.h>
 
@@ -54,5 +54,4 @@ extern struct console_driver econsole_drivers[];
 // 
 int printk(int msg_level, const char *fmt, ...);
 
-
-#endif /* CONSOLE_CONSOLE_H_ */
+#endif /* CONSOLE_H */
diff --git a/include/device/agp.h b/include/device/agp.h
index 66dfb0db2d..48f17b95c1 100644
--- a/include/device/agp.h
+++ b/include/device/agp.h
@@ -1,5 +1,3 @@
-#ifndef DEVICE_AGP_H
-#define DEVICE_AGP_H
 /* (c) 2005 Linux Networx GPL see COPYING for details */
 /*
 	This program is free software; you can redistribute it and/or modify
@@ -18,11 +16,13 @@
 
 */
 
+#ifndef DEVICE_AGP_H
+#define DEVICE_AGP_H
+
 unsigned int agp_scan_bus(struct bus *bus, 
 	unsigned min_devfn, unsigned max_devfn, unsigned int max);
 unsigned int agp_scan_bridge(struct device *dev, unsigned int max);
 
 extern struct device_operations default_agp_ops_bus;
 
-
 #endif /* DEVICE_AGP_H */
diff --git a/include/device/cardbus.h b/include/device/cardbus.h
index f7f813df15..4797155805 100644
--- a/include/device/cardbus.h
+++ b/include/device/cardbus.h
@@ -1,5 +1,3 @@
-#ifndef DEVICE_CARDBUS_H
-#define DEVICE_CARDBUS_H
 /* (c) 2005 Linux Networx GPL see COPYING for details */
 /*
 	This program is free software; you can redistribute it and/or modify
@@ -17,6 +15,10 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
+#ifndef DEVICE_CARDBUS_H
+#define DEVICE_CARDBUS_H
+
 void cardbus_read_resources(struct device *dev);
 unsigned int cardbus_scan_bus(struct bus *bus, 
 	unsigned min_devfn, unsigned max_devfn, unsigned int max);
diff --git a/include/device/device.h b/include/device/device.h
index feb8c401bb..19da730a93 100644
--- a/include/device/device.h
+++ b/include/device/device.h
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef DEVICE_H
-#define DEVICE_H
+#ifndef DEVICE_DEVICE_H
+#define DEVICE_DEVICE_H
 
 #include <types.h>
 #include <device/resource.h>
@@ -276,4 +276,4 @@ void phase4_assign_resources(struct bus *bus);
 unsigned int dev_phase3(struct device * bus, unsigned int max);
 void dev_phase5(struct device *dev);
 
-#endif /* DEVICE_H */
+#endif /* DEVICE_DEVICE_H */
diff --git a/include/device/hypertransport.h b/include/device/hypertransport.h
index 8a9c8bedf9..b2db30beb3 100644
--- a/include/device/hypertransport.h
+++ b/include/device/hypertransport.h
@@ -14,6 +14,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
 #ifndef DEVICE_HYPERTRANSPORT_H
 #define DEVICE_HYPERTRANSPORT_H
 
diff --git a/include/device/hypertransport_def.h b/include/device/hypertransport_def.h
index 4c9c634ac7..fbab24fd21 100644
--- a/include/device/hypertransport_def.h
+++ b/include/device/hypertransport_def.h
@@ -14,6 +14,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
 #ifndef DEVICE_HYPERTRANSPORT_DEF_H
 #define DEVICE_HYPERTRANSPORT_DEF_H
 
diff --git a/include/device/path.h b/include/device/path.h
index 04c591331f..b59431fd1c 100644
--- a/include/device/path.h
+++ b/include/device/path.h
@@ -14,6 +14,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
 #ifndef DEVICE_PATH_H
 #define DEVICE_PATH_H
 
diff --git a/include/device/pci.h b/include/device/pci.h
index b583179d0e..7b3a7b084c 100644
--- a/include/device/pci.h
+++ b/include/device/pci.h
@@ -20,6 +20,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef DEVICE_PCI_H
+#define DEVICE_PCI_H
+
+#include <types.h>
+#include <device/pci_def.h>
+#include <device/resource.h>
+#include <device/device.h>
+#include <device/pci_ops.h>
+#include <device/pci_rom.h>
+
 /*
  *	For more information, please consult the following manuals (look at
  *	http://www.pcisig.com/ for how to get them):
@@ -30,16 +40,6 @@
  *	PCI System Design Guide
  */
 
-#ifndef PCI_H
-#define PCI_H
-
-#include <types.h>
-#include <device/pci_def.h>
-#include <device/resource.h>
-#include <device/device.h>
-#include <device/pci_ops.h>
-#include <device/pci_rom.h>
-
 /* Common pci operations without a standard interface */
 struct pci_operations {
 	/* set the Subsystem IDs for the PCI device */
@@ -119,4 +119,4 @@ static inline const struct pci_bus_operations *ops_pci_bus(struct bus *bus)
 	return bops;
 }
 
-#endif /* PCI_H */
+#endif /* DEVICE_PCI_H */
diff --git a/include/device/pci_def.h b/include/device/pci_def.h
index 39bc6da9eb..4313e0992a 100644
--- a/include/device/pci_def.h
+++ b/include/device/pci_def.h
@@ -14,8 +14,9 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
-#ifndef PCI_DEF_H
-#define PCI_DEF_H
+
+#ifndef DEVICE_PCI_DEF_H
+#define DEVICE_PCI_DEF_H
 
 /*
  * Under PCI, each device has 256 bytes of configuration address space,
@@ -481,4 +482,4 @@
 #define PCI_FUNC(devfn)		((devfn) & 0x07)
 #define PCI_BDF(bus,dev,func)	((bus) << 16 | (dev) << 11 | (func) << 8)
 
-#endif /* PCI_DEF_H */
+#endif /* DEVICE_PCI_DEF_H */
diff --git a/include/device/pci_ids.h b/include/device/pci_ids.h
index 7f3b26a310..8e0ab96ca7 100644
--- a/include/device/pci_ids.h
+++ b/include/device/pci_ids.h
@@ -8,6 +8,9 @@
  * The 'Device classes and subclasses' section is copied from the Linux file.
  */
 
+#ifndef DEVICE_PCI_IDS_H
+#define DEVICE_PCI_IDS_H
+
 /*
  *	PCI Class, Vendor and Device IDs
  *
@@ -145,3 +148,4 @@
 
 #define PCI_VENDOR_ID_AMD		0x1022
 
+#endif /* DEVICE_PCI_IDS_H */
diff --git a/include/device/pci_ops.h b/include/device/pci_ops.h
index f843da2ef2..6398b9218c 100644
--- a/include/device/pci_ops.h
+++ b/include/device/pci_ops.h
@@ -14,8 +14,9 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
-#ifndef PCI_OPS_H
-#define PCI_OPS_H
+
+#ifndef DEVICE_PCI_OPS_H
+#define DEVICE_PCI_OPS_H
 
 #include <types.h>
 #include <device/device.h>
@@ -28,4 +29,4 @@ void pci_write_config8(struct device * dev, unsigned where, u8 val);
 void pci_write_config16(struct device * dev, unsigned where, u16 val);
 void pci_write_config32(struct device * dev, unsigned where, u32 val);
 
-#endif /* PCI_OPS_H */
+#endif /* DEVICE_PCI_OPS_H */
diff --git a/include/device/pci_rom.h b/include/device/pci_rom.h
index 5964eb7df8..ed114138f6 100644
--- a/include/device/pci_rom.h
+++ b/include/device/pci_rom.h
@@ -14,8 +14,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PCI_ROM_H
-#define PCI_ROM_H
+#ifndef DEVICE_PCI_ROM_H
+#define DEVICE_PCI_ROM_H
+
 #include <types.h>
 #include <byteorder.h>
 
@@ -54,4 +55,4 @@ extern struct rom_header *pci_rom_load(struct device *dev, struct rom_header *ro
 
 extern void pci_dev_init(struct device *dev);
 
-#endif
+#endif /* DEVICE_PCI_ROM_H */
diff --git a/include/device/pcie.h b/include/device/pcie.h
index 657c509204..0d70c5c439 100644
--- a/include/device/pcie.h
+++ b/include/device/pcie.h
@@ -14,9 +14,11 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
+/* (c) 2005 Linux Networx GPL see COPYING for details */
+
 #ifndef DEVICE_PCIE_H
 #define DEVICE_PCIE_H
-/* (c) 2005 Linux Networx GPL see COPYING for details */
 
 unsigned int pcie_scan_bus(struct bus *bus, 
 	unsigned min_devfn, unsigned max_devfn, unsigned int max);
diff --git a/include/device/pcix.h b/include/device/pcix.h
index 53d565214b..c125edb79c 100644
--- a/include/device/pcix.h
+++ b/include/device/pcix.h
@@ -14,8 +14,10 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
 #ifndef DEVICE_PCIX_H
 #define DEVICE_PCIX_H
+
 /* (c) 2005 Linux Networx GPL see COPYING for details */
 
 unsigned int pcix_scan_bus(struct bus *bus, 
diff --git a/include/device/pnp_def.h b/include/device/pnp_def.h
index 4a8206d761..6b8257cb47 100644
--- a/include/device/pnp_def.h
+++ b/include/device/pnp_def.h
@@ -14,6 +14,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
 #ifndef DEVICE_PNP_DEF_H
 #define DEVICE_PNP_DEF_H
 
@@ -26,5 +27,4 @@
 #define PNP_IDX_DRQ0 0x74
 #define PNP_IDX_DRQ1 0x75
 
-
 #endif /* DEVICE_PNP_DEF_H */
diff --git a/include/device/resource.h b/include/device/resource.h
index 4b5d4b51fe..53da982c1b 100644
--- a/include/device/resource.h
+++ b/include/device/resource.h
@@ -14,8 +14,9 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
-#ifndef RESOURCE_H
-#define RESOURCE_H
+
+#ifndef DEVICE_RESOURCE_H
+#define DEVICE_RESOURCE_H
 
 #include <types.h>
 
@@ -117,4 +118,4 @@ extern void search_global_resources(
 #define RESOURCE_TYPE_MAX 20
 extern const char *resource_type(struct resource *resource);
 
-#endif /* RESOURCE_H */
+#endif /* DEVICE_RESOURCE_H */
diff --git a/include/device/smbus.h b/include/device/smbus.h
index 0bc77fec9f..db4fe780f8 100644
--- a/include/device/smbus.h
+++ b/include/device/smbus.h
@@ -14,6 +14,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
 #ifndef DEVICE_SMBUS_H
 #define DEVICE_SMBUS_H
 
@@ -61,5 +62,4 @@ int smbus_process_call(struct device *dev, u8 cmd, u16 data);
 int smbus_block_read(struct device *dev, u8 cmd, u8 bytes, u8 *buffer);
 int smbus_block_write(struct device *dev, u8 cmd, u8 bytes, const u8 *buffer);
 
-
 #endif /* DEVICE_SMBUS_H */
diff --git a/include/device/smbus_def.h b/include/device/smbus_def.h
index a733f5f0af..4d2239ca18 100644
--- a/include/device/smbus_def.h
+++ b/include/device/smbus_def.h
@@ -14,6 +14,7 @@
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 */
+
 #ifndef DEVICE_SMBUS_DEF_H
 #define DEVICE_SMBUS_DEF_H
 
diff --git a/include/elf.h b/include/elf.h
index 56057a0455..2fcbc3cfa7 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -24,11 +24,11 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with the GNU C Library; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- * 02111-1307 USA.  
+ * 02111-1307 USA.
  */
 
-#ifndef _ELF_H
-#define	_ELF_H 1
+#ifndef ELF_H
+#define ELF_H
 
 #include <types.h>
 #include <archelf.h>
@@ -2632,4 +2632,4 @@ extern int elfboot(struct lb_memory *mem);
 #define BOOTLOADER "elfboot"
 #define BOOTLOADER_VERSION "1.3"
 
-#endif	/* elf.h */
+#endif /* ELF_H */
diff --git a/include/elf_boot.h b/include/elf_boot.h
index 1770b5d162..c6973460b5 100644
--- a/include/elf_boot.h
+++ b/include/elf_boot.h
@@ -16,7 +16,6 @@
  *
  */
 
-
 #ifndef ELF_BOOT_H 
 #define ELF_BOOT_H 
 
@@ -104,5 +103,4 @@ typedef struct
 #define LIN_INITRD_SIZE		0x00000005
 /* Size of the ramdisk in bytes */
 
-
 #endif /* ELF_BOOT_H */
diff --git a/include/isa-dma.h b/include/isa-dma.h
index 3d40c5da81..da46045072 100644
--- a/include/isa-dma.h
+++ b/include/isa-dma.h
@@ -17,10 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef __ISA_DMA_H
-#define __ISA_DMA_H
+#ifndef ISA_DMA_H
+#define ISA_DMA_H
 
 /* This function is called in the southbridge code. */
 void isa_dma_init(void);
 
-#endif
+#endif /* ISA_DMA_H */
diff --git a/include/keyboard.h b/include/keyboard.h
index b8ffa6e995..b92c0aa5e5 100644
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef __KEYBOARD_H
-#define __KEYBOARD_H
+#ifndef KEYBOARD_H
+#define KEYBOARD_H
 
 /* TODO: This structure should contain typematic settings, but LinuxBIOS
  * does not care yet.
@@ -30,4 +30,4 @@ struct pc_keyboard {
 void init_pc_keyboard(unsigned int port0, unsigned int port1,
 		      struct pc_keyboard *kbd);
 
-#endif
+#endif /* KEYBOARD_H */
diff --git a/include/lar.h b/include/lar.h
index c5df8dc267..18e2a936a9 100644
--- a/include/lar.h
+++ b/include/lar.h
@@ -47,6 +47,9 @@
  * ---------------------------------------------------------------------------
  */
 
+#ifndef LAR_H
+#define LAR_H
+
 #include <types.h>
 
 #define MAGIC "LARCHIVE"
@@ -68,3 +71,5 @@ struct mem_file {
 int find_file(struct mem_file *archive, char *filename, struct mem_file *result);
 int copy_file(struct mem_file *archive, char *filename, void *where);
 int run_file(struct mem_file *archive, char *filename, void *where);
+
+#endif /* LAR_H */
diff --git a/include/lib.h b/include/lib.h
index a14c1a1214..33dda4b06a 100644
--- a/include/lib.h
+++ b/include/lib.h
@@ -30,4 +30,4 @@ void delay(unsigned int secs);
 void beep_short(void);
 void beep_long(void);
 
-#endif
+#endif /* LIB_H */
diff --git a/include/mc146818rtc.h b/include/mc146818rtc.h
index 8bb25da10d..bada3c5595 100644
--- a/include/mc146818rtc.h
+++ b/include/mc146818rtc.h
@@ -117,5 +117,4 @@ void rtc_init(int invalid);
 int get_option(void *dest, char *name);
 int last_boot_normal(void);
 
-
-#endif /*  MC146818RTC_H */
+#endif /* MC146818RTC_H */
diff --git a/include/tables.h b/include/tables.h
index c8f905bcbb..c4c012b6e8 100644
--- a/include/tables.h
+++ b/include/tables.h
@@ -261,5 +261,4 @@ struct lb_memory *get_lb_mem(void);
 
 struct cmos_option_table *get_option_table(void);
 
-
 #endif /* TABLES_H */
diff --git a/include/uart8250.h b/include/uart8250.h
index 3fd3725380..5555c6b929 100644
--- a/include/uart8250.h
+++ b/include/uart8250.h
@@ -45,4 +45,4 @@ int uart8250_can_rx_byte(unsigned base_port);
 void uart8250_tx_byte(unsigned base_port, unsigned char data);
 void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs);
 
-#endif	/* UART8250_H */
+#endif /* UART8250_H */
diff --git a/lib/lzmadecode.h b/lib/lzmadecode.h
index dedde0de67..f885446ced 100644
--- a/lib/lzmadecode.h
+++ b/lib/lzmadecode.h
@@ -19,8 +19,8 @@
   to this file, however, are subject to the LGPL or CPL terms.
 */
 
-#ifndef __LZMADECODE_H
-#define __LZMADECODE_H
+#ifndef LZMADECODE_H
+#define LZMADECODE_H
 
 typedef unsigned char Byte;
 typedef unsigned short UInt16;
@@ -64,4 +64,4 @@ int LzmaDecode(CLzmaDecoderState *vs,
     const unsigned char *inStream, SizeT inSize, SizeT *inSizeProcessed,
     unsigned char *outStream, SizeT outSize, SizeT *outSizeProcessed);
 
-#endif
+#endif /* LZMADECODE_H */
diff --git a/mainboard/emulation/qemu-x86/config.h b/mainboard/emulation/qemu-x86/config.h
index 6a7e61ead0..3ba3cdbd4e 100644
--- a/mainboard/emulation/qemu-x86/config.h
+++ b/mainboard/emulation/qemu-x86/config.h
@@ -1,3 +1,8 @@
+#ifndef MAINBOARD_EMULATION_QEMU_X86_CONFIG_H
+#define MAINBOARD_EMULATION_QEMU_X86_CONFIG_H
+
 struct mainboard_emulation_qemu_x86_config {
 	int nothing;
 };
+
+#endif /* MAINBOARD_EMULATION_QEMU_X86_CONFIG_H */
diff --git a/northbridge/intel/i440bxemulation/config.h b/northbridge/intel/i440bxemulation/config.h
index b5dafafb7b..faa87bc3be 100644
--- a/northbridge/intel/i440bxemulation/config.h
+++ b/northbridge/intel/i440bxemulation/config.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef NORTHBRIDGE_INTEL_I440BXEMULATION_CONFIG_H
+#define NORTHBRIDGE_INTEL_I440BXEMULATION_CONFIG_H
+
 extern struct device_operations i440bxemulation_pcidomainops;
 extern struct constructor i440bx_constructors[];
 
@@ -27,3 +30,5 @@ struct northbridge_intel_i440bx_config {
 	 */
 	int ramsize;
 };
+
+#endif /* NORTHBRIDGE_INTEL_I440BXEMULATION_CONFIG_H */
diff --git a/northbridge/intel/i440bxemulation/i440bx.h b/northbridge/intel/i440bxemulation/i440bx.h
index 07698c12fc..3f9f121cb0 100644
--- a/northbridge/intel/i440bxemulation/i440bx.h
+++ b/northbridge/intel/i440bxemulation/i440bx.h
@@ -18,6 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef NORTHBRIDGE_INTEL_I440BXEMULATION_I440BX_H
+#define NORTHBRIDGE_INTEL_I440BXEMULATION_I440BX_H
+
 /*
  * Datasheet:
  *   - Name: Intel 440BX AGPset: 82443BX Host Bridge/Controller
@@ -89,3 +92,4 @@
 
 unsigned int i440bx_scan_root_bus(struct device *root, unsigned int max);
 
+#endif /* NORTHBRIDGE_INTEL_I440BXEMULATION_I440BX_H */
diff --git a/southbridge/intel/i82371eb/config.h b/southbridge/intel/i82371eb/config.h
index bc3910b480..e4b1ef0df4 100644
--- a/southbridge/intel/i82371eb/config.h
+++ b/southbridge/intel/i82371eb/config.h
@@ -20,9 +20,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#ifndef SOUTHBRIDGE_INTEL_I82371EB_CONFIG_H
+#define SOUTHBRIDGE_INTEL_I82371EB_CONFIG_H
+
 extern struct constructor i82371eb_constructors[];
 
 struct southbridge_intel_i82371eb_config {
         unsigned int ide0_enable : 1;
         unsigned int ide1_enable : 1;
 };
+
+#endif /* SOUTHBRIDGE_INTEL_I82371EB_CONFIG_H */
diff --git a/superio/winbond/w83627hf/chip.h b/superio/winbond/w83627hf/chip.h
index f8c7bf2c8f..b03f692b90 100644
--- a/superio/winbond/w83627hf/chip.h
+++ b/superio/winbond/w83627hf/chip.h
@@ -1,3 +1,6 @@
+#ifndef SUPERIO_WINBOND_W83627HF_CHIP_H
+#define SUPERIO_WINBOND_W83627HF_CHIP_H
+
 #include <keyboard.h>
 #include <uart8250.h>
 
@@ -5,3 +8,5 @@ struct superio_winbond_w83627hf_config {
 	int com1_baud, com2_baud;
 	struct pc_keyboard keyboard;
 };
+
+#endif /* SUPERIO_WINBOND_W83627HF_CHIP_H */
diff --git a/superio/winbond/w83627hf/w83627hf.h b/superio/winbond/w83627hf/w83627hf.h
index 7cd664cd16..17b5ecc34a 100644
--- a/superio/winbond/w83627hf/w83627hf.h
+++ b/superio/winbond/w83627hf/w83627hf.h
@@ -1,3 +1,6 @@
+#ifndef SUPERIO_WINBOND_W83627HF_W83627HF_H
+#define SUPERIO_WINBOND_W83627HF_W83627HF_H
+
 #define W83627HF_FDC              0   /* Floppy */
 #define W83627HF_PP               1   /* Parallel Port */
 #define W83627HF_SP1              2   /* Com1 */
@@ -88,4 +91,4 @@
 #define W83627HF_XSCNF		0x15
 #define W83627HF_XWBCNF		0x16
 
-
+#endif /* SUPERIO_WINBOND_W83627HF_W83627HF_H */