diff --git a/src/bin/screen_blanker/Jamfile b/src/bin/screen_blanker/Jamfile
index feebfc8ea4..9fe8e54b27 100644
--- a/src/bin/screen_blanker/Jamfile
+++ b/src/bin/screen_blanker/Jamfile
@@ -2,16 +2,28 @@ SubDir HAIKU_TOP src bin screen_blanker ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UseHeaders [ FDirName headers os add-ons screen_saver ] ;
+	# we also need our headers when build for BeOS
+
 UsePrivateHeaders interface screen_saver ;
 
 BinCommand screen_blanker :
 	ScreenBlanker.cpp
 	ScreenSaverWindow.cpp
 	PasswordWindow.cpp
+
+	ScreenSaver.cpp
+		# needed for some old/broken screen saver add-ons that do not
+		# link against libscreensaver.so
+
 	: be game libscreensaver.so
 	: screen_blanker.rdef
 ;
 
+SEARCH on [ FGristFiles
+		ScreenSaver.cpp
+	] = [ FDirName $(OBOS_TOP) src kits screensaver ] ;
+
 Package haiku-screensaverkit-cvs :
 	screen_blanker :
 	boot home config bin ;
diff --git a/src/preferences/screensaver/Jamfile b/src/preferences/screensaver/Jamfile
index 759f23c857..c74e882bdd 100644
--- a/src/preferences/screensaver/Jamfile
+++ b/src/preferences/screensaver/Jamfile
@@ -2,6 +2,9 @@ SubDir HAIKU_TOP src preferences screensaver ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UseHeaders [ FDirName headers os add-ons screen_saver ] ;
+	# we also need our headers when build for BeOS
+
 UsePrivateHeaders screen_saver ;
 SubDirSysHdrs $(SUBDIR) ;
 
@@ -11,10 +14,19 @@ Preference ScreenSaver :
 	PasswordWindow.cpp
 	PreviewView.cpp
 	MouseAreaView.cpp
+
+	ScreenSaver.cpp
+		# needed for some old/broken screen saver add-ons that do not
+		# link against libscreensaver.so
+
 	: tracker libscreensaver.so be $(TARGET_LIBSTDC++)
 	: ScreenSaver.rdef 
 	;
 
+SEARCH on [ FGristFiles
+		ScreenSaver.cpp
+	] = [ FDirName $(OBOS_TOP) src kits screensaver ] ;
+
 Package haiku-screensaverkit-cvs :
 	ScreenSaver :
 	boot home Desktop haiku-screensaverkit ;