Index: kernel/generic/include/syscall/copy.h
===================================================================
--- kernel/generic/include/syscall/copy.h	(revision d9ece1cb4b86e7a2d4c513bf4f6e95007768812f)
+++ kernel/generic/include/syscall/copy.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -36,5 +36,5 @@
 #define KERN_COPY_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Label within memcpy_from_uspace() that contains return -1. */
Index: kernel/generic/include/syscall/syscall.h
===================================================================
--- kernel/generic/include/syscall/syscall.h	(revision d9ece1cb4b86e7a2d4c513bf4f6e95007768812f)
+++ kernel/generic/include/syscall/syscall.h	(revision 76ca3f71d74c1d5be0fae6bcc28f1f663a624ea2)
@@ -93,5 +93,5 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,