diff --git a/src/servers/app/drawing/Painter/Jamfile b/src/servers/app/drawing/Painter/Jamfile
index f92da4e8d2..f736f5cd66 100644
--- a/src/servers/app/drawing/Painter/Jamfile
+++ b/src/servers/app/drawing/Painter/Jamfile
@@ -18,6 +18,9 @@ if $(TARGET_ARCH) = x86 {
 	PAINTER_ARCH_SOURCES = painter_bilinear_scale.nasm ;
 }
 
+Includes [ FGristFiles AGGTextRenderer.cpp Painter.cpp ]
+	: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
+
 StaticLibrary libpainter.a :
 	GlobalSubpixelSettings.cpp
 	Painter.cpp
diff --git a/src/servers/app/drawing/html5/Jamfile b/src/servers/app/drawing/html5/Jamfile
index 611656e782..9d1c6d89c4 100644
--- a/src/servers/app/drawing/html5/Jamfile
+++ b/src/servers/app/drawing/html5/Jamfile
@@ -13,6 +13,9 @@ 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 HTML5HWInterface.cpp HTML5DrawingEngine.cpp CanvasMessage.cpp ]
+	: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
+
 StaticLibrary libashtml5.a :
 	base64.cpp
 
diff --git a/src/servers/app/drawing/remote/Jamfile b/src/servers/app/drawing/remote/Jamfile
index aad0a86f86..836bc7bba9 100644
--- a/src/servers/app/drawing/remote/Jamfile
+++ b/src/servers/app/drawing/remote/Jamfile
@@ -13,6 +13,9 @@ 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 ]
+	: $(HAIKU_FREETYPE_HEADERS_DEPENDENCY) ;
+
 StaticLibrary libasremote.a :
 	NetReceiver.cpp
 	NetSender.cpp
diff --git a/src/servers/app/stackandtile/Jamfile b/src/servers/app/stackandtile/Jamfile
index 55882c8950..c9e16ea7fc 100644
--- a/src/servers/app/stackandtile/Jamfile
+++ b/src/servers/app/stackandtile/Jamfile
@@ -10,6 +10,9 @@ 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 :
 	SATDecorator.cpp
 	SATGroup.cpp