diff --git a/sys/i386/include/trap.h b/sys/i386/include/trap.h
index 82208d2a39ff..f0176b2c97e7 100644
--- a/sys/i386/include/trap.h
+++ b/sys/i386/include/trap.h
@@ -49,9 +49,6 @@
 #define	T_PAGEFLT	12	/* page fault */
 #define	T_ALIGNFLT	14	/* alignment fault */
 
-#ifdef XEN
-#define	T_HYPCALLBACK	17	/* hypervisor upcall */
-#endif
 #define	T_DIVIDE	18	/* integer divide fault */
 #define	T_NMI		19	/* non-maskable trap */
 #define	T_OFLOW		20	/* overflow trap */
diff --git a/sys/i386/xen/locore.s b/sys/i386/xen/locore.s
index 0bc9245a6da9..a2c4a8db7b74 100644
--- a/sys/i386/xen/locore.s
+++ b/sys/i386/xen/locore.s
@@ -136,16 +136,6 @@ KERNend:	.long	0		/* phys addr end of kernel (just after bss) */
 		.globl physfree
 physfree:	.long	0		/* phys addr of next free page */
 
-#ifdef SMP
-		.globl	cpu0prvpage
-cpu0pp:		.long	0		/* phys addr cpu0 private pg */
-cpu0prvpage:	.long	0		/* relocated version */
-
-		.globl	SMPpt
-SMPptpa:	.long	0		/* phys addr SMP page table */
-SMPpt:		.long	0		/* relocated version */
-#endif /* SMP */
-
 	.globl	IdlePTD
 IdlePTD:	.long	0		/* phys addr of kernel PTD */