diff --git a/arch/arm/measuremore/pmccntr_timestamp.c b/arch/arm/measuremore/pmccntr_timestamp.c
index 5ac69b32ac399df3ce44d90fdd5eace1816ad877..7d6c29a39b259b43ebf6945d1668a11370c5c460 100644
--- a/arch/arm/measuremore/pmccntr_timestamp.c
+++ b/arch/arm/measuremore/pmccntr_timestamp.c
@@ -1,4 +1,4 @@
-#include <linux/kernel.h>
+#include <asm/bug.h>
 
 #include "pmccntr_timestamp.h"
 
diff --git a/arch/arm/measuremore/pmccntr_timestamp.h b/arch/arm/measuremore/pmccntr_timestamp.h
index aaaddc0decd6f44f96f9efa6308f933e5e420742..f6e91746458cdd4c25ea9271da0f9261a5743d12 100644
--- a/arch/arm/measuremore/pmccntr_timestamp.h
+++ b/arch/arm/measuremore/pmccntr_timestamp.h
@@ -1,10 +1,6 @@
 #ifndef MEASUREMORE_PMCCNTR_TIMESTAMP_H
 #define MEASUREMORE_PMCCNTR_TIMESTAMP_H
 
-/* The following gives us the pmccntr_read(var) macro and the pmccntr_timestamp
- * struct. */
-#include <linux/measuremore.h>
-
 void pmccntr_enable(void);
 void pmccntr_reset(void);
 void pmccntr_granularity(uint32_t granularity);