diff --git a/headers/build/HaikuBuildCompatibility.h b/headers/build/HaikuBuildCompatibility.h
index a019306c57..1e78edc21f 100644
--- a/headers/build/HaikuBuildCompatibility.h
+++ b/headers/build/HaikuBuildCompatibility.h
@@ -52,13 +52,15 @@ typedef int socklen_t;
 		__attribute__((format(__printf__, _format_, _args_)))
 #endif
 
+#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
 // BeOS version of BeBuild.h defines this
-#define _IMPEXP_ROOT		__declspec(dllimport)
-#define	_IMPEXP_BE			__declspec(dllimport)
-#define	_IMPEXP_MEDIA		__declspec(dllimport)
-#define	_IMPEXP_TRACKER		__declspec(dllimport)
-#define _IMPEXP_TRANSLATION	__declspec(dllimport)
-#define _IMPEXP_DEVICE		__declspec(dllimport)
+#	define _IMPEXP_ROOT			__declspec(dllimport)
+#	define _IMPEXP_BE			__declspec(dllimport)
+#	define _IMPEXP_MEDIA		__declspec(dllimport)
+#	define _IMPEXP_TRACKER		__declspec(dllimport)
+#	define _IMPEXP_TRANSLATION	__declspec(dllimport)
+#	define _IMPEXP_DEVICE		__declspec(dllimport)
+#endif
 
 #ifdef __cplusplus
 class BBuffer;
diff --git a/headers/build/private/interface/ColorTools.h b/headers/build/private/interface/ColorTools.h
index 7c91767fe3..64fe4582ed 100644
--- a/headers/build/private/interface/ColorTools.h
+++ b/headers/build/private/interface/ColorTools.h
@@ -48,7 +48,7 @@ All rights reserved.
 
 #include <GraphicsDefs.h>
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_MAUI
+#if B_BEOS_VERSION <= B_BEOS_VERSION_5
 
 namespace BExperimental {