diff --git a/src/tests/servers/app/Jamfile b/src/tests/servers/app/Jamfile
index 7bdb60d7d5..ad37f37fd1 100644
--- a/src/tests/servers/app/Jamfile
+++ b/src/tests/servers/app/Jamfile
@@ -146,6 +146,7 @@ Server test_app_server :
 	z libtestappserver.so libpainter.a be
 	libhwinterface.so libhwinterfaceimpl.so
 	libagg.a libfreetype.so libtextencoding.so
+	$(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
 ;
 
 # install in the test dir
diff --git a/src/tests/servers/app/archived_view/Jamfile b/src/tests/servers/app/archived_view/Jamfile
index 27c79f043a..92e6af9085 100644
--- a/src/tests/servers/app/archived_view/Jamfile
+++ b/src/tests/servers/app/archived_view/Jamfile
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
 
 SimpleTest ArchivedView :
 	main.cpp
-	: be
+	: be $(TARGET_LIBSUPC++)
 	: ArchivedView.rdef
 	;
 
diff --git a/src/tests/servers/app/archived_view/main.cpp b/src/tests/servers/app/archived_view/main.cpp
index 0f3657b56e..04df3ed153 100644
--- a/src/tests/servers/app/archived_view/main.cpp
+++ b/src/tests/servers/app/archived_view/main.cpp
@@ -111,7 +111,7 @@ updateRect.PrintToStream();
 
 // Archive
 status_t
-TestView::Archive(BMessage* into, bool deep = true) const
+TestView::Archive(BMessage* into, bool deep) const
 {
 	status_t ret = BView::Archive(into, deep);
 
@@ -160,7 +160,7 @@ show_window(BRect frame, const char* name)
 				printf("instatiated BView\n");
 		}
 	}
-	
+
 	if (!view)
 		view = new TestView(window->Bounds(), "test", B_FOLLOW_ALL, B_WILL_DRAW);
 
diff --git a/src/tests/servers/app/regularapps/Jamfile b/src/tests/servers/app/regularapps/Jamfile
index 7c63b427d4..12a72cf8b3 100644
--- a/src/tests/servers/app/regularapps/Jamfile
+++ b/src/tests/servers/app/regularapps/Jamfile
@@ -13,9 +13,9 @@ SetSubDirSupportedPlatforms libbe_test ;
 
 SimpleTest TestApp_Clock :
 	cl_view.cpp
-	cl_wind.cpp 
+	cl_wind.cpp
 	clock.cpp
-	: be
+	: be $(TARGET_LIBSUPC++)
 	: Clock.rdef
 	;
 
diff --git a/src/tests/servers/app/stress_test/Jamfile b/src/tests/servers/app/stress_test/Jamfile
index aa0f6d9e25..b5c526c593 100644
--- a/src/tests/servers/app/stress_test/Jamfile
+++ b/src/tests/servers/app/stress_test/Jamfile
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
 
 Application StressTest :
 	main.cpp
-	: be
+	: be $(TARGET_LIBSTDC++)
 ;
 
 if ( $(TARGET_PLATFORM) = libbe_test ) {
diff --git a/src/tests/servers/app/stress_test/main.cpp b/src/tests/servers/app/stress_test/main.cpp
index 649873b684..b27695efed 100644
--- a/src/tests/servers/app/stress_test/main.cpp
+++ b/src/tests/servers/app/stress_test/main.cpp
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <Application.h>
 #include <MessageRunner.h>
diff --git a/src/tests/servers/app/window_invalidation/Jamfile b/src/tests/servers/app/window_invalidation/Jamfile
index 27a182b46f..dba528dad2 100644
--- a/src/tests/servers/app/window_invalidation/Jamfile
+++ b/src/tests/servers/app/window_invalidation/Jamfile
@@ -7,7 +7,7 @@ UsePrivateHeaders interface ;
 
 Application WindowInvalidation :
 	WindowInvalidation.cpp
-	: be $(TARGET_LIBSUPC++)
+	: be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
 ;
 
 if $(TARGET_PLATFORM) = libbe_test {
diff --git a/src/tests/servers/app/workspace_activated/Jamfile b/src/tests/servers/app/workspace_activated/Jamfile
index e243b93ea2..5337cdec0d 100644
--- a/src/tests/servers/app/workspace_activated/Jamfile
+++ b/src/tests/servers/app/workspace_activated/Jamfile
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
 
 Application WorkspaceActivated :
 	WorkspaceActivated.cpp
-	: be $(TARGET_LIBSUPC++)
+	: be $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
 ;
 
 if $(TARGET_PLATFORM) = libbe_test {
diff --git a/src/tests/servers/app/workspace_switcher/Jamfile b/src/tests/servers/app/workspace_switcher/Jamfile
index 8e12f117b2..4df7ba0728 100644
--- a/src/tests/servers/app/workspace_switcher/Jamfile
+++ b/src/tests/servers/app/workspace_switcher/Jamfile
@@ -8,7 +8,7 @@ UseHeaders [ FDirName os interface ] ;
 
 Application workspace_switcher :
 	workspace_switcher.cpp
-	: be
+	: be $(TARGET_LIBSTDC++)
 ;
 
 if $(TARGET_PLATFORM) = libbe_test {