diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index f443fa73fa..df8fb66dbd 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -604,6 +604,11 @@ if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 # platform, e.g. containing missing POSIX/GNU headers.
 HOST_HDRS += [ FDirName $(HAIKU_TOP) headers build host $(HOST_PLATFORM) ] ;
 
+# For all versions of BeOS also add the common beos directory.
+if $(HOST_PLATFORM) in r5 bone dano {
+	HOST_HDRS += [ FDirName $(HAIKU_TOP) headers build host beos_common ] ;
+}
+
 
 #pragma mark -
 
diff --git a/headers/build/host/beos_common/stdint.h b/headers/build/host/beos_common/stdint.h
new file mode 100644
index 0000000000..8049f02f15
--- /dev/null
+++ b/headers/build/host/beos_common/stdint.h
@@ -0,0 +1 @@
+#include <inttypes.h>