diff --git a/src/kits/Jamfile b/src/kits/Jamfile
index 96f7b7ff27..f6675146aa 100644
--- a/src/kits/Jamfile
+++ b/src/kits/Jamfile
@@ -8,9 +8,9 @@ UsePrivateHeaders app ;
 UsePrivateHeaders interface ;
 UsePrivateHeaders support ;
 
-UsePublicHeaders [ FDirName os app ] ;
-UsePublicHeaders [ FDirName os interface ] ;
-UsePublicHeaders [ FDirName os support ] ;
+UsePublicHeaders app ;
+UsePublicHeaders interface ;
+UsePublicHeaders support ;
 
 SharedLibrary openbeos :
 	<$(SOURCE_GRIST)>app/$(APP_KIT_SOURCE)
diff --git a/src/kits/storage/Jamfile b/src/kits/storage/Jamfile
index 6f8fe31973..5202af64ee 100644
--- a/src/kits/storage/Jamfile
+++ b/src/kits/storage/Jamfile
@@ -14,8 +14,8 @@ LinkSharedOSLibs libbeadapter.so :
 
 UsePrivateHeaders storage ;
 
-UsePublicHeaders [ FDirName os storage ] ;
-UsePublicHeaders [ FDirName os add-ons file_system ] ;
+UsePublicHeaders storage ;
+UsePublicHeaders [ FDirName add-ons file_system ] ;
 
 SharedLibrary storage :
 	Directory.cpp
diff --git a/src/tests/kits/app/bhandler/Jamfile b/src/tests/kits/app/bhandler/Jamfile
index ff0704fed9..8946628925 100644
--- a/src/tests/kits/app/bhandler/Jamfile
+++ b/src/tests/kits/app/bhandler/Jamfile
@@ -17,5 +17,5 @@ CommonUnitTest BHandlerTester
 	: kits app
 	: libopenbeos.so be stdc++.r4
 	: be stdc++.r4
-	: [ FDirName os app ] [ FDirName os support ]
+	: app support
 ;
diff --git a/src/tests/kits/app/bmessenger/Jamfile b/src/tests/kits/app/bmessenger/Jamfile
index 8a7c52592e..1d4fb87f8e 100644
--- a/src/tests/kits/app/bmessenger/Jamfile
+++ b/src/tests/kits/app/bmessenger/Jamfile
@@ -7,5 +7,5 @@ CommonUnitTest BMessengerTester
 	: kits app
 	: libopenbeos.so be stdc++.r4
 	: be stdc++.r4
-	: [ FDirName os app ] [ FDirName os support ]
+	: app support
 ;
diff --git a/src/tests/kits/storage/Jamfile b/src/tests/kits/storage/Jamfile
index 153437eff7..c281164306 100644
--- a/src/tests/kits/storage/Jamfile
+++ b/src/tests/kits/storage/Jamfile
@@ -20,7 +20,7 @@ CommonUnitTest StorageKitTester
 	: kits storage
 	: libstorage.so be stdc++.r4
 	: be stdc++.r4
-	: [ FDirName os storage ]
+	: storage
 ;
 
 # To run the tests the libraries must be around.