8 files changed, 2 insertions, 16 deletions
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index b6279631c9e7..204d8b3c42c5 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -100,9 +100,7 @@ typedef	__uint32_t	__uint_least32_t;
 typedef	__uint64_t	__uint_least64_t;
 typedef	__uint32_t	__u_register_t;
 typedef	__uint32_t	__vm_offset_t;
-typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint32_t	__vm_paddr_t;
-typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint32_t	__vm_size_t;
 
 typedef	unsigned int	___wchar_t;
diff --git a/sys/arm64/include/_types.h b/sys/arm64/include/_types.h
index 8720ca883c5b..f1d4af4ab1d6 100644
--- a/sys/arm64/include/_types.h
+++ b/sys/arm64/include/_types.h
@@ -88,9 +88,7 @@ typedef	__uint32_t	__uint_least32_t;
 typedef	__uint64_t	__uint_least64_t;
 typedef	__uint64_t	__u_register_t;
 typedef	__uint64_t	__vm_offset_t;
-typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_paddr_t;
-typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint64_t	__vm_size_t;
 typedef	unsigned int	___wchar_t;
 
diff --git a/sys/mips/include/_types.h b/sys/mips/include/_types.h
index a05f01c8d7ff..d37b1bc99886 100644
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
@@ -143,8 +143,6 @@ typedef	__uint64_t	__vm_paddr_t;
 typedef	__uint32_t	__vm_paddr_t;
 #endif
 
-typedef	__int64_t	__vm_ooffset_t;
-typedef	__uint64_t	__vm_pindex_t;
 typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
diff --git a/sys/powerpc/include/_types.h b/sys/powerpc/include/_types.h
index 2c92afc9341a..fc2285fecfec 100644
--- a/sys/powerpc/include/_types.h
+++ b/sys/powerpc/include/_types.h
@@ -135,8 +135,6 @@ typedef	__uint32_t	__vm_paddr_t;
 #endif
 typedef	__uint32_t	__vm_size_t;
 #endif
-typedef	__int64_t	__vm_ooffset_t;
-typedef	__uint64_t	__vm_pindex_t;
 typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */
diff --git a/sys/riscv/include/_types.h b/sys/riscv/include/_types.h
index 733d47cc3aeb..29e3c6a17427 100644
--- a/sys/riscv/include/_types.h
+++ b/sys/riscv/include/_types.h
@@ -88,9 +88,7 @@ typedef	__uint32_t	__uint_least32_t;
 typedef	__uint64_t	__uint_least64_t;
 typedef	__uint64_t	__u_register_t;
 typedef	__uint64_t	__vm_offset_t;
-typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_paddr_t;
-typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint64_t	__vm_size_t;
 typedef	int		___wchar_t;
 
diff --git a/sys/sparc64/include/_types.h b/sys/sparc64/include/_types.h
index 62e2fe9f0adb..70b85d9e361a 100644
--- a/sys/sparc64/include/_types.h
+++ b/sys/sparc64/include/_types.h
@@ -88,9 +88,7 @@ typedef	__uint32_t	__uint_least32_t;
 typedef	__uint64_t	__uint_least64_t;
 typedef	__uint64_t	__u_register_t;
 typedef	__uint64_t	__vm_offset_t;
-typedef	__int64_t	__vm_ooffset_t;
 typedef	__uint64_t	__vm_paddr_t;
-typedef	__uint64_t	__vm_pindex_t;
 typedef	__uint64_t	__vm_size_t;
 typedef	int		___wchar_t;
 
diff --git a/sys/sys/types.h b/sys/sys/types.h
index 6e2c01219c3b..4945e81e7c97 100644
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -250,9 +250,9 @@ typedef	struct cap_rights	cap_rights_t;
 #endif
 
 typedef	__vm_offset_t	vm_offset_t;
-typedef	__vm_ooffset_t	vm_ooffset_t;
+typedef	__int64_t	vm_ooffset_t;
 typedef	__vm_paddr_t	vm_paddr_t;
-typedef	__vm_pindex_t	vm_pindex_t;
+typedef	__uint64_t	vm_pindex_t;
 typedef	__vm_size_t	vm_size_t;
 
 typedef __rman_res_t    rman_res_t;
diff --git a/sys/x86/include/_types.h b/sys/x86/include/_types.h
index e6d1f6007db2..8aa0e2ba01b7 100644
--- a/sys/x86/include/_types.h
+++ b/sys/x86/include/_types.h
@@ -142,8 +142,6 @@ typedef	__uint32_t	__vm_paddr_t;
 #endif
 typedef	__uint32_t	__vm_size_t;
 #endif
-typedef	__int64_t	__vm_ooffset_t;
-typedef	__uint64_t	__vm_pindex_t;
 typedef	int		___wchar_t;
 
 #define	__WCHAR_MIN	__INT_MIN	/* min value for a wchar_t */