diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index c79abdf121..d13922a9a4 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -606,7 +606,6 @@ HOST_BE_API_HEADERS =
 	[ FDirName $(HAIKU_TOP) headers build os ]
 	[ FDirName $(HAIKU_TOP) headers build os add-ons registrar ]
 	[ FDirName $(HAIKU_TOP) headers build os app ]
-	[ FDirName $(HAIKU_TOP) headers build os bluetooth ]
 	[ FDirName $(HAIKU_TOP) headers build os drivers ]
 	[ FDirName $(HAIKU_TOP) headers build os kernel ]
 	[ FDirName $(HAIKU_TOP) headers build os interface ]
diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index 29ee910235..d0672649bd 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -45,7 +45,6 @@ DESKBAR_DESKTOP_APPLETS +=
 ;
 
 SYSTEM_PREFERENCES += [ FFilterByBuildFeatures
-	Bluetooth
 	DataTranslations
 	E-mail
 	Media
@@ -70,7 +69,6 @@ rule HaikuImageGetSystemLibs
 		[ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
 			libalm.so
 			libbe.so libbsd.so libbnetapi.so
-			libbluetooth.so
 			libdebug.so libdevice.so
 			libgame.so libglut.so@mesa libgnu.so
 			libmail.so libmedia.so libmidi.so libmidi2.so
@@ -97,7 +95,7 @@ rule HaikuImageGetPrivateSystemLibs
 
 SYSTEM_SERVERS += [ FFilterByBuildFeatures
 	mail_daemon media_addon_server media_server midi_server
-	nfs4_idmapper_server bluetooth_server
+	nfs4_idmapper_server
 	print_server print_addon_server
 ] ;