diff --git a/src/kits/shared/Keymap.cpp b/src/kits/shared/Keymap.cpp
index 4c8206485c..44d26fd400 100644
--- a/src/kits/shared/Keymap.cpp
+++ b/src/kits/shared/Keymap.cpp
@@ -19,7 +19,7 @@
 #include <ByteOrder.h>
 #include <File.h>
 
-#if (defined(__BEOS__) || defined(__HAIKU__))
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 #	include "SystemKeymap.h"
 	// generated by the build system
 #endif
@@ -112,7 +112,7 @@ BKeymap::SetTo(BDataIO& stream)
 status_t
 BKeymap::SetToCurrent()
 {
-#if (defined(__BEOS__) || defined(__HAIKU__))
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	key_map* keys = NULL;
 	get_key_map(&keys, &fChars);
 	if (!keys)
@@ -131,7 +131,7 @@ BKeymap::SetToCurrent()
 status_t
 BKeymap::SetToDefault()
 {
-#if (defined(__BEOS__) || defined(__HAIKU__))
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 	fKeys = kSystemKeymap;
 	fCharsSize = kSystemKeyCharsSize;
 
diff --git a/src/tools/keymap/Jamfile b/src/tools/keymap/Jamfile
index e4d1e64bad..9f0859a10b 100644
--- a/src/tools/keymap/Jamfile
+++ b/src/tools/keymap/Jamfile
@@ -7,19 +7,29 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin keymap ] ;
 
 USES_BE_API on <build>keymap = true ;
 
-local reSources ;
+local regexSources ;
+local storageSources ;
+
 if $(HOST_PLATFORM) = cygwin || $(HOST_PLATFORM) = sunos {
-	reSources = regex.c ;
+	regexSources = regex.c ;
+}
+if $(HOST_PLATFORM) = haiku_host {
+	# those are missing from early Haiku builds
+	storageSources = FileIO.cpp ;
 }
 
 BuildPlatformMain <build>keymap :
 	main.cpp
 	Keymap.cpp
-	$(reSources)
+	$(regexSources)
+	$(storageSources)
 	: libshared_build.a $(HOST_LIBSTDC++) $(HOST_LIBSUPC++)
 ;
 
 LinkAgainst <build>keymap : $(HOST_LIBBE) ;
 
-SEARCH on [ FGristFiles $(reSources) ]
+SEARCH on [ FGristFiles $(regexSources) ]
 	= [ FDirName $(HAIKU_TOP) src system libroot posix glibc regex ] ;
+
+SEARCH on [ FGristFiles $(storageSources) ]
+	= [ FDirName $(HAIKU_TOP) src kits storage ] ;