diff --git a/kern/drivers/dev/vars.c b/kern/drivers/dev/vars.c
index 69ff731..8d9b5d9 100644
--- a/kern/drivers/dev/vars.c
+++ b/kern/drivers/dev/vars.c
@@ -459,10 +459,10 @@
 
 static char *s = "string";
 static char c = 'x';
-static uint8_t  u8  = 8;
-static uint16_t u16 = 16;
-static uint32_t u32 = 32;
-static uint64_t u64 = 64;
+static uint8_t  _u8  = 8;
+static uint16_t _u16 = 16;
+static uint32_t _u32 = 32;
+static uint64_t _u64 = 64;
 static uint8_t  d8  = -8;
 static uint16_t d16 = -16;
 static uint32_t d32 = -32;
@@ -481,10 +481,10 @@
 
 DEVVARS_ENTRY(s, "s");
 DEVVARS_ENTRY(c, "c");
-DEVVARS_ENTRY(u8,  "ub");
-DEVVARS_ENTRY(u16, "uh");
-DEVVARS_ENTRY(u32, "uw");
-DEVVARS_ENTRY(u64, "ug");
+DEVVARS_ENTRY(_u8,  "ub");
+DEVVARS_ENTRY(_u16, "uh");
+DEVVARS_ENTRY(_u32, "uw");
+DEVVARS_ENTRY(_u64, "ug");
 DEVVARS_ENTRY(d8,  "db");
 DEVVARS_ENTRY(d16, "dh");
 DEVVARS_ENTRY(d32, "dw");
diff --git a/kern/include/sys/types.h b/kern/include/sys/types.h
index 1bcc4bd..308f7a6 100644
--- a/kern/include/sys/types.h
+++ b/kern/include/sys/types.h
@@ -26,6 +26,15 @@
 typedef uint16_t __le16;
 typedef uint16_t __be16;
 
+typedef uint64_t u64;
+typedef uint32_t u32;
+typedef uint16_t u16;
+typedef uint8_t u8;
+typedef int64_t s64;
+typedef int32_t s32;
+typedef int16_t s16;
+typedef int8_t s8;
+
 #define KiB	1024u
 #define MiB	1048576u
 #define GiB	1073741824u
diff --git a/scripts/spatch/linux/scalar.cocci b/scripts/spatch/linux/scalar.cocci
index 9a7486a..a703e1c 100644
--- a/scripts/spatch/linux/scalar.cocci
+++ b/scripts/spatch/linux/scalar.cocci
@@ -1,38 +1,4 @@
 @@
-typedef u8;
-typedef uint8_t;
-@@
--u8
-+uint8_t
-
-@@
-typedef u16;
-typedef uint16_t;
-@@
--u16
-+uint16_t
-
-@@
-typedef __u16;
-@@
--__u16
-+uint16_t
-
-@@
-typedef u32;
-typedef uint32_t;
-@@
--u32
-+uint32_t
-
-@@
-typedef u64;
-typedef uint64_t;
-@@
--u64
-+uint64_t
-
-@@
 typedef cycle_t;
 typedef uint64_t;
 @@
@@ -40,34 +6,6 @@
 +uint64_t
 
 @@
-typedef s8;
-typedef int8_t;
-@@
--s8
-+int8_t
-
-@@
-typedef s16;
-typedef int16_t;
-@@
--s16
-+int16_t
-
-@@
-typedef s32;
-typedef int32_t;
-@@
--s32
-+int32_t
-
-@@
-typedef s64;
-typedef int64_t;
-@@
--s64
-+int64_t
-
-@@
 typedef uint;
 @@
 -uint