diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 3dfb04a7c6..55ca07c413 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -1384,7 +1384,23 @@ if $(HAIKU_NO_WERROR) != 1 {
 	EnableWerror src kits textencoding ;
 #	EnableWerror src kits tracker ;
 	EnableWerror src kits translation ;
-	EnableWerror src servers ;
+	EnableWerror src servers app ;
+#	EnableWerror src servers bluetooth ;
+	EnableWerror src servers cddb_daemon ;
+	EnableWerror src servers debug ;
+	EnableWerror src servers input ;
+	EnableWerror src servers mail ;
+	EnableWerror src servers media ;
+	EnableWerror src servers media_addon ;
+	EnableWerror src servers midi ;
+	EnableWerror src servers mount ;
+	EnableWerror src servers net ;
+	EnableWerror src servers notification ;
+	EnableWerror src servers power ;
+	EnableWerror src servers print ;
+	EnableWerror src servers registrar ;
+	EnableWerror src servers services_daemon ;
+	EnableWerror src servers syslog_daemon ;
 	EnableWerror src system kernel ;
 	EnableWerror src system runtime_loader ;
 }