Index: kernel/generic/include/syscall/copy.h
===================================================================
--- kernel/generic/include/syscall/copy.h	(revision 953bc1efafe8161834d87acae8f871ef640154a5)
+++ kernel/generic/include/syscall/copy.h	(revision ce89036b64f8d563964217c344f139b41be8d6cf)
@@ -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 953bc1efafe8161834d87acae8f871ef640154a5)
+++ kernel/generic/include/syscall/syscall.h	(revision ce89036b64f8d563964217c344f139b41be8d6cf)
@@ -71,5 +71,5 @@
 	SYS_IPC_REGISTER_IRQ,
 	SYS_IPC_UNREGISTER_IRQ,
-
+	
 	SYS_EVENT_SUBSCRIBE,
 	
@@ -83,9 +83,12 @@
 	SYS_INTERRUPT_ENABLE,
 	
-	SYS_SYSINFO_VALID,
-	SYS_SYSINFO_VALUE,
+	SYS_SYSINFO_GET_TAG,
+	SYS_SYSINFO_GET_VALUE,
+	SYS_SYSINFO_GET_DATA_SIZE,
+	SYS_SYSINFO_GET_DATA,
 	
 	SYS_DEBUG_ENABLE_CONSOLE,
 	SYS_DEBUG_DISABLE_CONSOLE,
+	
 	SYS_IPC_CONNECT_KBOX,
 	SYSCALL_END
@@ -94,5 +97,5 @@
 #ifdef KERNEL
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 typedef unative_t (*syshandler_t)(unative_t, unative_t, unative_t, unative_t,