diff --git a/src/apps/activitymonitor/Jamfile b/src/apps/activitymonitor/Jamfile
index b6cd7a811d..591631d38f 100644
--- a/src/apps/activitymonitor/Jamfile
+++ b/src/apps/activitymonitor/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src apps activitymonitor ;
 
-UsePrivateHeaders shared system ;
+UsePrivateHeaders interface system ;
 
 Application ActivityMonitor :
 	ActivityMonitor.cpp
diff --git a/src/apps/deskcalc/Jamfile b/src/apps/deskcalc/Jamfile
index b002ccd714..1a94679b2f 100644
--- a/src/apps/deskcalc/Jamfile
+++ b/src/apps/deskcalc/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps deskcalc ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders shared ;
+UsePrivateHeaders interface shared ;
 
 Application DeskCalc :
 	CalcApplication.cpp
diff --git a/src/apps/diskprobe/Jamfile b/src/apps/diskprobe/Jamfile
index 1d077bf520..1d354f5b76 100644
--- a/src/apps/diskprobe/Jamfile
+++ b/src/apps/diskprobe/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps diskprobe ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders shared ;
+UsePrivateHeaders interface shared ;
 
 Application DiskProbe :
 	DiskProbe.cpp
diff --git a/src/apps/networkstatus/Jamfile b/src/apps/networkstatus/Jamfile
index ce3b22bb94..e71777aa8b 100644
--- a/src/apps/networkstatus/Jamfile
+++ b/src/apps/networkstatus/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps networkstatus ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders net shared ;
+UsePrivateHeaders interface net ;
 UseLibraryHeaders agg ;
 
 local icon_libs ;
diff --git a/src/apps/powerstatus/Jamfile b/src/apps/powerstatus/Jamfile
index 3c757a8e13..3e88b2e80a 100644
--- a/src/apps/powerstatus/Jamfile
+++ b/src/apps/powerstatus/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps powerstatus ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders shared ;
+UsePrivateHeaders interface shared ;
 UsePrivateSystemHeaders ;
 
 Application PowerStatus :
diff --git a/src/apps/processcontroller/Jamfile b/src/apps/processcontroller/Jamfile
index ca8f24c59e..7aeb06a177 100644
--- a/src/apps/processcontroller/Jamfile
+++ b/src/apps/processcontroller/Jamfile
@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src apps processcontroller ;
 
 UsePrivateSystemHeaders ;
-UsePrivateHeaders app shared ;
+UsePrivateHeaders app interface ;
 
 Application ProcessController :
 	AutoIcon.cpp
diff --git a/src/apps/webpositive/Jamfile b/src/apps/webpositive/Jamfile
index d6986bec1e..df84daa81a 100644
--- a/src/apps/webpositive/Jamfile
+++ b/src/apps/webpositive/Jamfile
@@ -64,7 +64,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 
 		# private OS headers
 		UseLibraryHeaders icon ;
-		UsePrivateHeaders shared tracker ;
+		UsePrivateHeaders interface shared tracker ;
 		SubDirHdrs $(HAIKU_TOP) src kits tracker ;
 
 		Application WebPositive :
diff --git a/src/preferences/locale/Jamfile b/src/preferences/locale/Jamfile
index c03be7987f..0868f6f9e6 100644
--- a/src/preferences/locale/Jamfile
+++ b/src/preferences/locale/Jamfile
@@ -1,7 +1,6 @@
 SubDir HAIKU_TOP src preferences locale ;
 
-UsePrivateHeaders locale ;
-UsePrivateHeaders shared ;
+UsePrivateHeaders interface locale ;
 
 local sources =
 	LanguageListView.cpp