diff --git a/src/servers/app/drawing/remote/Jamfile b/src/servers/app/drawing/remote/Jamfile
index 836bc7bba9..30f00d66fb 100644
--- a/src/servers/app/drawing/remote/Jamfile
+++ b/src/servers/app/drawing/remote/Jamfile
@@ -13,7 +13,8 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter drawing_modes
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter font_support ] ;
 UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
 
-Includes [ FGristFiles RemoteDrawingEngine.cpp RemoteMessage.cpp RemoteHWInterface.cpp ]
+Includes [ FGristFiles RemoteDrawingEngine.cpp RemoteMessage.cpp
+	RemoteHWInterface.cpp ]
 	: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
 
 StaticLibrary libasremote.a :
diff --git a/src/servers/app/stackandtile/Jamfile b/src/servers/app/stackandtile/Jamfile
index c9e16ea7fc..8842e3b1ad 100644
--- a/src/servers/app/stackandtile/Jamfile
+++ b/src/servers/app/stackandtile/Jamfile
@@ -10,14 +10,17 @@ UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
 UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;
 UseHeaders $(HAIKU_FREETYPE_HEADERS) : true ;
 
-Includes [ FGristFiles SATDecorator.cpp SATGroup.cpp SATWindow.cpp StackAndTile.cpp Stacking.cpp Tiling.cpp ]
-	: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
-
-StaticLibrary libstackandtile.a :
+local sources =
 	SATDecorator.cpp
 	SATGroup.cpp
 	SATWindow.cpp
 	StackAndTile.cpp
 	Stacking.cpp
-	Tiling.cpp
+	Tiling.cpp ;
+
+Includes [ FGristFiles $(sources) ]
+	: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
+
+StaticLibrary libstackandtile.a :
+	$(sources)
 ;