diff --git a/xen/common/perfc.c b/xen/common/perfc.c
index 8c967ab900..b748c8af85 100644
--- a/xen/common/perfc.c
+++ b/xen/common/perfc.c
@@ -1,13 +1,12 @@
 
+#include <xen/cpumask.h>
 #include <xen/errno.h>
-#include <xen/lib.h>
-#include <xen/smp.h>
-#include <xen/time.h>
-#include <xen/perfc.h>
-#include <xen/keyhandler.h> 
-#include <xen/spinlock.h>
-#include <xen/mm.h>
 #include <xen/guest_access.h>
+#include <xen/lib.h>
+#include <xen/perfc.h>
+#include <xen/spinlock.h>
+#include <xen/time.h>
+
 #include <public/sysctl.h>
 
 #define PERFCOUNTER( var, name )              { name, TYPE_SINGLE, 0 },
diff --git a/xen/include/xen/perfc.h b/xen/include/xen/perfc.h
index f9009dc388..324b476655 100644
--- a/xen/include/xen/perfc.h
+++ b/xen/include/xen/perfc.h
@@ -3,8 +3,7 @@
 
 #ifdef CONFIG_PERF_COUNTERS
 
-#include <xen/lib.h>
-#include <xen/smp.h>
+#include <xen/macros.h>
 #include <xen/percpu.h>
 
 /*