diff --git a/ChangeLog b/ChangeLog
index 6c89eaad6..8640249ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-09  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* include/grub/i386/cpuid.h: Add header protection.
+
 2009-10-09  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Fail gracefuly when attempting to load 64-bit kFreeBSD on IA32 CPU.
diff --git a/include/grub/i386/cpuid.h b/include/grub/i386/cpuid.h
index f6ae20f38..09b313bb8 100644
--- a/include/grub/i386/cpuid.h
+++ b/include/grub/i386/cpuid.h
@@ -16,4 +16,9 @@
  *  along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef GRUB_CPU_CPUID_HEADER
+#define GRUB_CPU_CPUID_HEADER 1
+
 extern unsigned char grub_cpuid_has_longmode;
+
+#endif