Index: kernel/arch/amd64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/amd64/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/amd64/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -36,5 +36,9 @@
                 {
                         negative-guard: KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard: KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/arm32/include/arch/cp15.h
===================================================================
--- kernel/arch/arm32/include/arch/cp15.h	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/arm32/include/arch/cp15.h	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -40,5 +40,5 @@
 #include <typedefs.h>
 #else
-#include <sys/types.h>
+#include <stdint.h>
 #endif
 
Index: kernel/arch/arm32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/arm32/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/arm32/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/ia32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/ia32/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/ia32/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -36,5 +36,9 @@
                 {
                         negative-guard: KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard: KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/ia64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/ia64/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/ia64/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -40,5 +40,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 },
                 {
Index: kernel/arch/mips32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/mips32/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/mips32/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/ppc32/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/ppc32/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/ppc32/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/riscv64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/riscv64/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/riscv64/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -37,5 +37,5 @@
                 {
                         negative-guard: KERNEL,
-                        include : <sys/types.h>
+                        include : <stdint.h>
                 }
         ],
Index: kernel/arch/sparc64/include/arch/istate_struct.ag
===================================================================
--- kernel/arch/sparc64/include/arch/istate_struct.ag	(revision 14d5223e8675d263e4b3baa6c206621e173bd411)
+++ kernel/arch/sparc64/include/arch/istate_struct.ag	(revision fec333b34757b0ab4e68ee81582f355cfa664e93)
@@ -36,5 +36,9 @@
                 {
                         negative-guard : KERNEL,
-                        include : <sys/types.h>
+                        include : <stddef.h>
+                },
+                {
+                        negative-guard : KERNEL,
+                        include : <stdint.h>
                 }
         ],