diff --git a/src/add-ons/kernel/drivers/audio/echo/24/Jamfile b/src/add-ons/kernel/drivers/audio/echo/24/Jamfile
index 57093bbeea..214665f639 100644
--- a/src/add-ons/kernel/drivers/audio/echo/24/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/24/Jamfile
@@ -63,7 +63,7 @@ SEARCH on [ FGristFiles
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp 
-	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 SEARCH on [ FGristFiles
 		debug.c
diff --git a/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile b/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile
index 5fca28aa49..8bceb3eaf1 100644
--- a/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/echo/gals/Jamfile
@@ -59,7 +59,7 @@ SEARCH on [ FGristFiles
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp 
-	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 SEARCH on [ FGristFiles
 		debug.c
diff --git a/src/add-ons/kernel/file_systems/udf/Jamfile b/src/add-ons/kernel/file_systems/udf/Jamfile
index 0d9315b0f4..563a104264 100644
--- a/src/add-ons/kernel/file_systems/udf/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/Jamfile
@@ -47,7 +47,7 @@ R5KernelAddon udf : kernel file_systems :
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp 
-	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 
 rule InstallUDF
diff --git a/src/apps/pulse/Jamfile b/src/apps/pulse/Jamfile
index 0bf5d26d3e..bd30f9a5e7 100644
--- a/src/apps/pulse/Jamfile
+++ b/src/apps/pulse/Jamfile
@@ -30,5 +30,5 @@ if $(HAIKU_COMPATIBLE) {
 
 SEARCH on [ FGristFiles
                 strlcpy.c
-        ] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+        ] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
 
diff --git a/src/tools/copy_to_bfs_image/Jamfile b/src/tools/copy_to_bfs_image/Jamfile
index a4867e7faa..ed63ebf916 100644
--- a/src/tools/copy_to_bfs_image/Jamfile
+++ b/src/tools/copy_to_bfs_image/Jamfile
@@ -46,11 +46,11 @@ SEARCH on [ FGristFiles
 
 SEARCH on [ FGristFiles
 		kernel_cpp.cpp
-	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+	] = [ FDirName $(OBOS_TOP) src system kernel util ] ;
 
 SEARCH on [ FGristFiles
 		strlcat.c
-	] = [ FDirName $(OBOS_TOP) src kernel libroot posix string ] ;
+	] = [ FDirName $(OBOS_TOP) src system libroot posix string ] ;
 
 SEARCH on [ FGristFiles
 		rootfs.c initfs.c kernel.c cache.c sl.c stub.c sysdep.c hexdump.c argv.c