diff --git a/kern/include/common.h b/kern/include/common.h
index 344da5c..5086bfc 100644
--- a/kern/include/common.h
+++ b/kern/include/common.h
@@ -3,6 +3,11 @@
 #include <ros/common.h>
 #include <compiler.h>
 
+#ifndef __ASSEMBLER__
+#include <sys/types.h>
+#include <linux/overflow.h>
+#endif
+
 /* Force a rebuild of the whole kernel if 64BIT-ness changed */
 #ifdef CONFIG_64BIT
 #endif
diff --git a/kern/include/linux/overflow.h b/kern/include/linux/overflow.h
index 40b48e2..82148de 100644
--- a/kern/include/linux/overflow.h
+++ b/kern/include/linux/overflow.h
@@ -2,7 +2,7 @@
 #ifndef __LINUX_OVERFLOW_H
 #define __LINUX_OVERFLOW_H
 
-#include <linux/compiler.h>
+#include <compiler.h>
 
 /*
  * In the fallback code below, we need to compute the minimum and