diff --git a/headers/build/HaikuBuildCompatibility.h b/headers/build/HaikuBuildCompatibility.h
index df2dc26b7d..d199c933af 100644
--- a/headers/build/HaikuBuildCompatibility.h
+++ b/headers/build/HaikuBuildCompatibility.h
@@ -9,15 +9,19 @@
 	kludges in our source files at a minimum.
 */
 
-#include <sys/types.h>
-#include <SupportDefs.h>
+#ifdef HAIKU_HOST_PLATFORM_DANO
+#	include <be_setup.h>
+#endif
 
-#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#if defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) || defined(HAIKU_HOST_PLATFORM_DANO)
 #	define _BE_ERRNO_H_
 		// this is what Dano/Zeta is using
 #	include <Errors.h>
 #endif
 
+#include <sys/types.h>
+#include <SupportDefs.h>
+
 #include <string.h>
 
 // no addr_t under standard BeOS
@@ -117,14 +121,17 @@ extern float	roundf(float value);
 
 // These are R1-specific extensions
 #ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
-#	define B_TRANSLATION_MAKE_VERSION(major,minor,revision) ((major << 8) | ((minor << 4) & 0xf0) | (revision & 0x0f))
+#	define B_TRANSLATION_MAKE_VERSION(major, minor, revision) \
+		((major << 8) | ((minor << 4) & 0xf0) | (revision & 0x0f))
 #	define B_TRANSLATION_MAJOR_VERSION(v) (v >> 8)
 #	define B_TRANSLATION_MINOR_VERSION(v) ((v >> 4) & 0xf)
 #	define B_TRANSLATION_REVISION_VERSION(v) (v & 0xf)
-#	define B_LARGE_ICON_TYPE		'ICON'
-#	define B_MINI_ICON_TYPE			'MICN'
-#	define B_VECTOR_ICON_TYPE		'VICN'
-#	define B_BITMAP_NO_SERVER_LINK	0
+#	ifndef HAIKU_HOST_PLATFORM_DANO
+#		define B_LARGE_ICON_TYPE		'ICON'
+#		define B_MINI_ICON_TYPE			'MICN'
+#		define B_VECTOR_ICON_TYPE		'VICN'
+#		define B_BITMAP_NO_SERVER_LINK	0
+#	endif
 #endif	// HAIKU_TARGET_PLATFORM_LIBBE_TEST
 
 #if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
@@ -135,10 +142,9 @@ extern float	roundf(float value);
 #endif
 
 #if !defined(HAIKU_TARGET_PLATFORM_HAIKU) && !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
-#	ifndef B_VECTOR_ICON_TYPE
-#		define B_VECTOR_ICON_TYPE 'VICN'
+#	ifndef HAIKU_HOST_PLATFORM_DANO
+#		define B_NOT_SUPPORTED			(B_ERROR)
 #	endif
-#	define B_NOT_SUPPORTED				(B_ERROR)
 #	define B_KERNEL_READ_AREA			0
 #	define B_KERNEL_WRITE_AREA			0
 #endif
diff --git a/src/build/libhaikucompat/Jamfile b/src/build/libhaikucompat/Jamfile
index cad6207218..f0a46096d3 100644
--- a/src/build/libhaikucompat/Jamfile
+++ b/src/build/libhaikucompat/Jamfile
@@ -28,6 +28,9 @@ if $(HOST_PLATFORM) in r5 bone dano {
 	if $(HOST_PLATFORM) = dano {
 		ObjectDefines $(libbePatchSources) : _IMPEXP_BE= ;
 	}
+	ObjectC++Flags $(libbePatchSources)
+		: -include [ FDirName $(HAIKU_TOP) headers build
+			HaikuBuildCompatibility.h ] ;
 }
 
 BuildPlatformStaticLibrary libhaikucompat_build.a :
diff --git a/src/tools/Jamfile b/src/tools/Jamfile
index b86dda8bb4..a50d31877e 100644
--- a/src/tools/Jamfile
+++ b/src/tools/Jamfile
@@ -22,7 +22,10 @@ USES_BE_API on $(tools) = true ;
 # TODO: temporary kludge
 local libHaikuCompat ;
 if $(HOST_PLATFORM) in r5 bone dano {
-	UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ;
+	ObjectC++Flags database_support.cpp UpdateMimeInfoThread.cpp
+		MimeUpdateThread.cpp
+		: -include [ FDirName $(HAIKU_TOP) headers build
+			HaikuBuildCompatibility.h ] ;
 	libHaikuCompat = libhaikucompat_build.a ;
 }