diff --git a/sys/compat/linuxkpi/common/include/asm/types.h b/sys/compat/linuxkpi/common/include/asm/types.h
index 63e1ac6aca8c..daa5d83616a2 100644
--- a/sys/compat/linuxkpi/common/include/asm/types.h
+++ b/sys/compat/linuxkpi/common/include/asm/types.h
@@ -31,7 +31,7 @@
 #ifndef	_ASM_TYPES_H_
 #define	_ASM_TYPES_H_
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_STANDALONE)
 
 #include <sys/types.h>
 
@@ -59,6 +59,6 @@ typedef vm_paddr_t dma64_addr_t;
 
 typedef unsigned short umode_t;
 
-#endif	/* _KERNEL */
+#endif	/* _KERNEL || _STANDALONE */
 
 #endif	/* _ASM_TYPES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/linux/types.h b/sys/compat/linuxkpi/common/include/linux/types.h
index 4d39e79e8a5d..aa3580c81a27 100644
--- a/sys/compat/linuxkpi/common/include/linux/types.h
+++ b/sys/compat/linuxkpi/common/include/linux/types.h
@@ -57,8 +57,10 @@ typedef uint16_t __aligned_u16 __aligned(sizeof(uint16_t));
 typedef uint32_t __aligned_u32 __aligned(sizeof(uint32_t));
 typedef uint64_t __aligned_u64 __aligned(sizeof(uint64_t));
 
+#ifdef _KERNEL
 typedef unsigned short ushort;
 typedef unsigned int    uint;
+#endif
 typedef unsigned long ulong;
 typedef unsigned gfp_t;
 typedef off_t loff_t;
@@ -67,7 +69,7 @@ typedef uint16_t __bitwise__ __sum16;
 typedef unsigned long pgoff_t;
 typedef unsigned __poll_t;
 
-typedef u64 phys_addr_t;
+typedef uint64_t phys_addr_t;
 
 typedef size_t __kernel_size_t;