diff --git a/headers/build/BeOSBuildCompatibility.h b/headers/build/BeOSBuildCompatibility.h
index cf1c34c511..3364aef138 100644
--- a/headers/build/BeOSBuildCompatibility.h
+++ b/headers/build/BeOSBuildCompatibility.h
@@ -28,7 +28,6 @@
 
 typedef unsigned long	haiku_build_addr_t;
 #define addr_t			haiku_build_addr_t
-#define phys_addr_t		haiku_build_addr_t
 
 #include <Errors.h>
 
diff --git a/headers/build/os/support/SupportDefs.h b/headers/build/os/support/SupportDefs.h
index dafc3ea948..71a60184ce 100644
--- a/headers/build/os/support/SupportDefs.h
+++ b/headers/build/os/support/SupportDefs.h
@@ -57,6 +57,13 @@ typedef int64					bigtime_t;
 typedef uint32					type_code;
 typedef uint32					perform_code;
 
+#ifdef HAIKU_HOST_PLATFORM_64_BIT
+typedef uint64					phys_addr_t;
+#else
+typedef uint32					phys_addr_t;
+#endif
+typedef phys_addr_t				phys_size_t;
+
 
 /* printf()/scanf() format strings for [u]int* types */
 #define B_PRId8			PRId8
diff --git a/headers/os/support/SupportDefs.h b/headers/os/support/SupportDefs.h
index 6d06092fe7..2b7e625b27 100644
--- a/headers/os/support/SupportDefs.h
+++ b/headers/os/support/SupportDefs.h
@@ -56,6 +56,9 @@ typedef int64					nanotime_t;
 typedef uint32					type_code;
 typedef uint32					perform_code;
 
+typedef __haiku_phys_addr_t		phys_addr_t;
+typedef phys_addr_t				phys_size_t;
+
 
 /* printf()/scanf() format strings for [u]int* types */
 #define B_PRId8			"d"
diff --git a/headers/posix/sys/types.h b/headers/posix/sys/types.h
index 445106bcae..223cd75d32 100644
--- a/headers/posix/sys/types.h
+++ b/headers/posix/sys/types.h
@@ -50,7 +50,6 @@ typedef __haiku_std_int32	nlink_t;
 typedef char*				caddr_t;
 
 typedef __haiku_addr_t		addr_t;
-typedef __haiku_phys_addr_t	phys_addr_t;
 typedef __haiku_int32 		key_t;
 
 #include <null.h>
diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h
index 7b507d229f..4770b3af47 100644
--- a/headers/private/fs_shell/fssh_api_wrapper.h
+++ b/headers/private/fs_shell/fssh_api_wrapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2009, Ingo Weinhold, bonefish@cs.tu-berlin.de.
+ * Copyright 2007-2010, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _FSSH_API_WRAPPER_H
@@ -1492,6 +1492,7 @@
 
 #define addr_t			fssh_addr_t
 #define phys_addr_t		fssh_phys_addr_t
+#define phys_size_t		fssh_phys_size_t
 
 #define dev_t			fssh_dev_t
 #define ino_t			fssh_ino_t
diff --git a/headers/private/fs_shell/fssh_types.h b/headers/private/fs_shell/fssh_types.h
index 8ec884586f..f478664d53 100644
--- a/headers/private/fs_shell/fssh_types.h
+++ b/headers/private/fs_shell/fssh_types.h
@@ -23,6 +23,7 @@ typedef uint32_t	fssh_phys_addr_t;
 typedef uint32_t	fssh_size_t;
 typedef int32_t		fssh_ssize_t;
 #endif
+typedef fssh_phys_addr_t	fssh_phys_size_t;
 
 typedef int32_t		fssh_dev_t;
 typedef int64_t		fssh_ino_t;