diff --git a/src/kits/Jamfile b/src/kits/Jamfile
index 946a3b0e93..b07941915c 100644
--- a/src/kits/Jamfile
+++ b/src/kits/Jamfile
@@ -71,6 +71,7 @@ SharedLibrary libbe_haiku.so :
 
 	libbeadapter.so
 	$(TARGET_NETWORK_LIBS)
+	libpng.so # For dumping the screen to PNG in the Interface Kit
 	$(TARGET_LIBSTDC++)
 ;
 
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index ec374cc16c..7d5ccfa7cb 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -118,6 +118,7 @@ Server haiku_app_server :
 #	AccelerantBuffer.cpp
 #	AccelerantHWInterface.cpp
 	BitmapBuffer.cpp
+	BitmapDrawingEngine.cpp
 	drawing_support.cpp
 	DrawingEngine.cpp
 	MallocBuffer.cpp
diff --git a/src/tests/servers/registrar/Jamfile b/src/tests/servers/registrar/Jamfile
index e7aec42038..5022f20113 100644
--- a/src/tests/servers/registrar/Jamfile
+++ b/src/tests/servers/registrar/Jamfile
@@ -60,10 +60,10 @@ SimpleTest user_shutdown_reply
 # the registrar itself
 
 UsePrivateHeaders app ;
-UsePrivateHeaders kernel ;
 UsePrivateHeaders shared ;
 UsePrivateHeaders storage ;
 UsePrivateHeaders tracker ;
+UsePrivateSystemHeaders ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers registrar ] ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src servers registrar mime ] ;