diff --git a/src/kits/screensaver/Jamfile b/src/kits/screensaver/Jamfile
index 0a116f7fff..acc85d2f51 100644
--- a/src/kits/screensaver/Jamfile
+++ b/src/kits/screensaver/Jamfile
@@ -1,6 +1,6 @@
 SubDir OBOS_TOP src kits screensaver ;
 
-UsePrivateHeaders screensaver ;
+UsePrivateHeaders screen_saver ;
 
 SharedLibrary screensaver :
 	ScreenSaver.cpp
diff --git a/src/prefs/screensaver/Jamfile b/src/prefs/screensaver/Jamfile
index fb248a599f..85164b5623 100644
--- a/src/prefs/screensaver/Jamfile
+++ b/src/prefs/screensaver/Jamfile
@@ -1,5 +1,7 @@
 SubDir OBOS_TOP src prefs screensaver ;
 
+UsePrivateHeaders screen_saver ;
+
 AddResources ScreenSaver : ScreenSaver.rsrc ;
 
 local sources =
@@ -14,8 +16,3 @@ Preference ScreenSaver : $(sources) ;
 
 LinkSharedOSLibs ScreenSaver : tracker libscreensaver.so be stdc++.r4 ;
 
-# Ugly hack: Prepend the dir containing Be's ScreenSaver.h to the list of
-# include search dirs. Otherwise it won't be found.
-# It is certainly a good idea to rename the local files.
-# PrependObjectHdrs $(sources) : /boot/develop/headers/be/add-ons/screen_saver ;
-
diff --git a/src/servers/screensaver/Jamfile b/src/servers/screensaver/Jamfile
index 23d66a8959..9c3c712478 100644
--- a/src/servers/screensaver/Jamfile
+++ b/src/servers/screensaver/Jamfile
@@ -1,5 +1,7 @@
 SubDir OBOS_TOP src servers screensaver ;
 
+UsePrivateHeaders screen_saver ;
+
 Server OBOSscreensaver :
 	ScreenSaverApp.cpp
 	SSAwindow.cpp