diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
index 911d7e0b3cd9c0db77504e9ccc6606bba8da51e7..a522fbada97ea8f61bd6fbddd2f617b53c0d90c0 100644
--- a/include/asm-x86/page.h
+++ b/include/asm-x86/page.h
@@ -79,6 +79,19 @@
 #ifndef __ASSEMBLY__
 void clear_page(void *page);
 void copy_page(void *to, void *from);
+
+/*
+ * These are used to make use of C type-checking..
+ */
+typedef unsigned long	pteval_t;
+typedef unsigned long	pmdval_t;
+typedef unsigned long	pudval_t;
+typedef unsigned long	pgdval_t;
+typedef unsigned long	pgprotval_t;
+typedef unsigned long	phys_addr_t;
+
+typedef struct { pteval_t pte; } pte_t;
+
 #endif	/* !__ASSEMBLY__ */
 
 #endif	/* CONFIG_X86_64 */
diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h
index f5e0543b8afa81e8a31d4279260c892e16e5acb6..f5e82c695d26f90e925d848bef9ee25971fb62a9 100644
--- a/include/asm-x86/page_64.h
+++ b/include/asm-x86/page_64.h
@@ -10,7 +10,6 @@ extern unsigned long end_pfn_map;
 /*
  * These are used to make use of C type-checking..
  */
-typedef struct { unsigned long pte; } pte_t;
 typedef struct { unsigned long pmd; } pmd_t;
 typedef struct { unsigned long pud; } pud_t;
 typedef struct { unsigned long pgd; } pgd_t;