diff --git a/src/servers/app/server/Jamfile b/src/servers/app/server/Jamfile
index 7823613470..8fc0cd0f59 100644
--- a/src/servers/app/server/Jamfile
+++ b/src/servers/app/server/Jamfile
@@ -1,3 +1,4 @@
+SubInclude OBOS_TOP src servers app server fonts ;
 SubDir OBOS_TOP src servers app server ;
 
 Depends app_server : install_fonts ;
@@ -22,6 +23,7 @@ SharedLibrary appserver :
 	ServerBitmap.cpp
 	ServerCursor.cpp
 	ServerFont.cpp
+	FontServer.cpp
 	SysCursor.cpp
 	SystemPalette.cpp
 	TokenHandler.cpp
@@ -49,18 +51,17 @@ Server app_server :
 	ServerWindow.cpp
 
 	# Font Classes
-	FontServer.cpp
 
 	# Display Classes
 	AccelerantDriver.cpp
+	ScreenDriver.cpp
+	ViewDriver.cpp
 	DefaultDecorator.cpp
 	DesktopClasses.cpp
 	Layer.cpp
 	RootLayer.cpp
-	ScreenDriver.cpp
-	ServerPicture.cpp
-	ViewDriver.cpp
 	WinBorder.cpp
+	ServerPicture.cpp
 ;
 
 LINKFLAGS on app_server ?= $(LINKFLAGS) ;
@@ -70,4 +71,3 @@ LinkSharedOSLibs app_server : root game translation libz.so libpng.so libappserv
 							   <boot!home!config!lib>libopenbeos.so 
 							   <boot!home!config!lib>libfreetype.so ;
 
-SubInclude OBOS_TOP src servers app server fonts ;