diff --git a/src/add-ons/kernel/bus_managers/pci/Jamfile b/src/add-ons/kernel/bus_managers/pci/Jamfile
index 7d34211ed3..6900fa1cc6 100644
--- a/src/add-ons/kernel/bus_managers/pci/Jamfile
+++ b/src/add-ons/kernel/bus_managers/pci/Jamfile
@@ -1,11 +1,20 @@
 SubDir OBOS_TOP src add-ons kernel bus_managers pci ;
 
+UsePrivateHeaders [ FDirName kernel ] ;
+
 KernelMergeObject pci_bus_manager.o : 
-	<$(SOURCE_GRIST)>pci.c
+	kernel_cpp.cpp
+	<$(SOURCE_GRIST)>pci.cpp
+	<$(SOURCE_GRIST)>pci_info.cpp
+	<$(SOURCE_GRIST)>pci_module.c
 	:
 	-fno-pic -Wno-unused -D_KERNEL_MODE
 	;
 
+SEARCH on [ FGristFiles
+		kernel_cpp.cpp 
+	] = [ FDirName $(OBOS_TOP) src kernel core util ] ;
+
 KernelLd pci :
 	pci_bus_manager.o
 	pci_arch_$(OBOS_ARCH)_bus_manager.o