diff --git a/src/kits/package/hpkg/DataReader.cpp b/src/kits/package/hpkg/DataReader.cpp
index f6e4984f4b..b50955f03c 100644
--- a/src/kits/package/hpkg/DataReader.cpp
+++ b/src/kits/package/hpkg/DataReader.cpp
@@ -11,7 +11,10 @@
 #include <string.h>
 
 #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
-#include <arch/user_memory.h>
+// for user_memcpy() and IS_USER_ADDRESS()
+#include <KernelExport.h>
+
+#include <kernel.h>
 #endif
 
 
diff --git a/src/kits/support/DataIO.cpp b/src/kits/support/DataIO.cpp
index f9e1121fc0..e13f21921c 100644
--- a/src/kits/support/DataIO.cpp
+++ b/src/kits/support/DataIO.cpp
@@ -16,7 +16,10 @@
 #include <Errors.h>
 
 #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
-#include <arch/user_memory.h>
+// for user_memcpy() and IS_USER_ADDRESS()
+#include <KernelExport.h>
+
+#include <kernel.h>
 #endif