diff --git a/include/elf.h b/include/elf.h
index fbd47beafa..73aa5d5b1f 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -1,10 +1,14 @@
-/* This file was taken from the GNU C Library, CVS rev. 1.156, 
- * and modified for use by the LinuxBIOS project. 
+/*
+ * This file is part of the LinuxBIOS project.
+ *
+ * It is based on elf/elf.h from the GNU C Library, CVS rev. 1.156.
+ *
+ * Modifications are:
+ * Copyright (C) 2001 Eric Biederman <ebiederman@lnxi.com>
  */
 
 /* This file defines standard ELF types, structures, and macros.
  * Copyright (C) 1995-2003,2004,2005,2006,2007 Free Software Foundation, Inc.
- * Copyright (C) 2001 Eric Biederman <ebiederman@lnxi.com>
  * This file is part of the GNU C Library.
  *
  * The GNU C Library is free software; you can redistribute it and/or
diff --git a/include/isa-dma.h b/include/isa-dma.h
index 5a42d30dff..3d40c5da81 100644
--- a/include/isa-dma.h
+++ b/include/isa-dma.h
@@ -20,8 +20,7 @@
 #ifndef __ISA_DMA_H
 #define __ISA_DMA_H
 
-/* This function is called in the southbridge code */
+/* This function is called in the southbridge code. */
 void isa_dma_init(void);
 
 #endif
-
diff --git a/include/keyboard.h b/include/keyboard.h
index e3d6d63126..b8ffa6e995 100644
--- a/include/keyboard.h
+++ b/include/keyboard.h
@@ -18,17 +18,16 @@
  */
 
 #ifndef __KEYBOARD_H
-#define __KEYBOARD_H 1
+#define __KEYBOARD_H
 
+/* TODO: This structure should contain typematic settings, but LinuxBIOS
+ * does not care yet.
+ */
 struct pc_keyboard {
-	// this structure should contain typematic settings, but LinuxBIOS
-	// does not care yet.
 };
 
-/* This function is called in the SuperIO code */
-void init_pc_keyboard(unsigned int port0, unsigned int port1, struct pc_keyboard *kbd);
-
-
+/* This function is called in the Super-IO code. */
+void init_pc_keyboard(unsigned int port0, unsigned int port1,
+		      struct pc_keyboard *kbd);
 
 #endif
-
diff --git a/include/stdlib.h b/include/stdlib.h
index dc2c688ae5..5ac8286f85 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,4 +1,6 @@
 /*
+ * This file is part of the LinuxBIOS project.
+ *
  * Copyright (C) 2007 coresystems GmbH
  * Written by Stefan Reinauer <stepan@coresystems.de> for coresystems GmbH
  *