--- old-xen-unstable-pae/xen/arch/x86/cdb.c	2005-05-11 15:51:44.000000000 +0000
+++ new-xen-unstable-pae/xen/arch/x86/cdb.c	2005-05-11 17:31:56.000000000 +0000
@@ -12,12 +12,15 @@
 #include <asm/irq.h>
 #include <xen/spinlock.h>
 #include <asm/debugger.h>
-#include <asm/init.h>
+#include <xen/init.h>
 
 /* Printk isn't particularly safe just after we've trapped to the
    debugger. so avoid it. */
 #define dbg_printk(...)
 
+extern void smp_send_stop(void);
+extern unsigned int watchdog_on;
+
 static unsigned char opt_cdb[30] = "none";
 string_param("cdb", opt_cdb);