diff --git a/src/kits/app/Jamfile b/src/kits/app/Jamfile
index 43afa4ee67..266b5d2aad 100644
--- a/src/kits/app/Jamfile
+++ b/src/kits/app/Jamfile
@@ -17,7 +17,7 @@ if $(RUN_WITHOUT_APP_SERVER) != 0 {
 	SubDirC++Flags $(defines) ;
 }
 
-UsePrivateHeaders shared app interface ;
+UsePrivateHeaders shared app interface kernel ;
 UsePrivateHeaders [ FDirName servers app ] ;
 UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ;
 
diff --git a/src/kits/app/ServerMemoryAllocator.cpp b/src/kits/app/ServerMemoryAllocator.cpp
index 274ca002e1..24aa915894 100644
--- a/src/kits/app/ServerMemoryAllocator.cpp
+++ b/src/kits/app/ServerMemoryAllocator.cpp
@@ -16,7 +16,9 @@
 
 #include "ServerMemoryAllocator.h"
 
-#include <syscalls.h>
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+#	include <syscalls.h>
+#endif
 
 #include <new>
 
@@ -64,10 +66,15 @@ ServerMemoryAllocator::AddArea(area_id serverArea, area_id& _area, uint8*& _base
 		return B_NO_MEMORY;
 	}
 
+#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
 	// reserve 128 MB of space for the area
 	void* base = (void*)0x60000000;
 	status_t status = _kern_reserve_heap_address_range((addr_t*)&base,
 		B_BASE_ADDRESS, 128 * 1024 * 1024);
+#else
+	void* base;
+	status_t status = B_ERROR;
+#endif
 
 	mapping->local_area = clone_area("server_memory", &base,
 		status == B_OK ? B_EXACT_ADDRESS : B_BASE_ADDRESS,
diff --git a/src/servers/app/ClientMemoryAllocator.cpp b/src/servers/app/ClientMemoryAllocator.cpp
index 441252dc2a..7fac88dd11 100644
--- a/src/servers/app/ClientMemoryAllocator.cpp
+++ b/src/servers/app/ClientMemoryAllocator.cpp
@@ -193,8 +193,12 @@ ClientMemoryAllocator::_AllocateChunk(size_t size, bool& newArea)
 		}
 
 		char name[B_OS_NAME_LENGTH];
+#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST
+		strcpy(name, "client heap");
+#else
 		snprintf(name, sizeof(name), "heap:%ld:%s", fApplication->ClientTeam(),
 			fApplication->SignatureLeaf());
+#endif
 		area_id area = create_area(name, (void**)&address, B_ANY_ADDRESS, size,
 			B_NO_LOCK, B_READ_AREA | B_WRITE_AREA);
 		if (area < B_OK) {
diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index b7750e829b..d3646c8293 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -29,7 +29,6 @@ SharedLibrary libhwinterface.so :
 	BBitmapBuffer.cpp
 	DWindowBuffer.cpp
 	HWInterface.cpp
-	MultiLocker.cpp
 	RGBColor.cpp
 
 	: libhaikuappserver.so be
@@ -45,6 +44,7 @@ LINKFLAGS on libhwinterfaceimpl.so += -lbe ;
 SharedLibrary libhwinterfaceimpl.so :
 	ViewHWInterface.cpp
 	DWindowHWInterface.cpp
+	MultiLocker.cpp
 
 	: be libhwinterface.so
 ;
@@ -60,20 +60,20 @@ SharedLibrary libhaikuappserver.so :
 	DesktopSettings.cpp
 	DrawState.cpp
 	FontFamily.cpp
+	FontManager.cpp
 	HashTable.cpp
+	MultiLocker.cpp
 	RGBColor.cpp
 	ServerBitmap.cpp
 	ServerCursor.cpp
 	ServerFont.cpp
-	FontManager.cpp
 	SystemPalette.cpp
 
 	# drawing
 	PatternHandler.cpp
 
 	# libraries
-	:
-	be libtextencoding.so libfreetype.so
+	: be libtextencoding.so libfreetype.so
 ;
 
 AddResources haiku_app_server : app_server.rdef ;