diff --git a/xen/arch/x86/pdb-stub.c b/xen/arch/x86/pdb-stub.c
index bb145aa104..827035e07f 100644
--- a/xen/arch/x86/pdb-stub.c
+++ b/xen/arch/x86/pdb-stub.c
@@ -21,6 +21,7 @@
 #include <xen/list.h>
 #include <xen/serial.h>
 #include <xen/softirq.h>
+#include <xen/init.h>
 
 /* opt_pdb: Name of serial port for Xen pervasive debugger (and enable pdb) */
 static unsigned char opt_pdb[10] = "none";
diff --git a/xen/common/trace.c b/xen/common/trace.c
index 06547c67d1..83bf5ce55e 100644
--- a/xen/common/trace.c
+++ b/xen/common/trace.c
@@ -25,6 +25,7 @@
 #include <xen/smp.h>
 #include <xen/trace.h>
 #include <xen/errno.h>
+#include <xen/init.h>
 #include <asm/atomic.h>
 #include <public/dom0_ops.h>
 
diff --git a/xen/include/asm-x86/x86_32/regs.h b/xen/include/asm-x86/x86_32/regs.h
index e03e2a8a4b..57d21e3cb6 100644
--- a/xen/include/asm-x86/x86_32/regs.h
+++ b/xen/include/asm-x86/x86_32/regs.h
@@ -1,6 +1,8 @@
 #ifndef _I386_REGS_H
 #define _I386_REGS_H
 
+#include <asm/types.h>
+
 struct xen_regs
 {
     /* All saved activations contain the following fields. */