diff --git a/src/servers/app/server/DisplayDriver.cpp b/src/servers/app/server/DisplayDriver.cpp
index ece00a5cca..b97fd24f44 100644
--- a/src/servers/app/server/DisplayDriver.cpp
+++ b/src/servers/app/server/DisplayDriver.cpp
@@ -34,6 +34,7 @@
 #include "RectUtils.h"
 #include "Utils.h"
 #include "ServerCursor.h"
+#include "CursorData.h"
 
 // TODO: Remove remnants of old API.  Inplement all functions.  Bounds checking needs to be
 // handled by the public drawing functions.
@@ -41,46 +42,6 @@
 
 static Blitter blitter;
 
-int8 default_cursor_data[] = {
-16,1,0,0,
-255,224,	// ***********-----
-128,16,		// *----------*----
-128,16,		// *----------*----
-128,96,		// *--------**-----
-128,16,		// *----------*----
-128,8,		// *-----------*---
-128,8,		// *-----------*---
-128,16,		// *----------*----
-128,32,		// *---------*-----
-144,64,		// *--*-----*------
-144,128,	// *--*----*-------
-105,0,		// -**-*--*--------
-6,0,		// -----**---------
-
-0,0,		// ----------------
-0,0,		// ----------------
-0,0,		// ----------------
-
-// default_cursor mask - black pixels are always opaque
-255,224,
-255,240,
-255,240,
-255,224,
-255,240,
-255,248,
-255,248,
-255,240,
-255,224,
-255,192,
-255,128,
-111,0,
-6,0,
-
-0,0,
-0,0,
-0,0
-};
-
 /*!
 	\brief Sets up internal variables needed by all DisplayDriver subclasses
 	
diff --git a/src/servers/app/server/Jamfile b/src/servers/app/server/Jamfile
index 027a6fd2b1..b7667803dd 100644
--- a/src/servers/app/server/Jamfile
+++ b/src/servers/app/server/Jamfile
@@ -13,6 +13,7 @@ SharedLibrary appserver :
 	BGet++.cpp
 	BitmapManager.cpp
 	ColorSet.cpp
+	CursorData.cpp
 	CursorHandler.cpp
 	Decorator.cpp
 	DisplayDriver.cpp
@@ -41,7 +42,6 @@ LinkSharedOSLibs libappserver.so : root be
 
 Server app_server :
 	# Misc. Sources
-	CursorData.cpp
 	FMWList.cpp
 	PicturePlayer.cpp
 	PNGDump.cpp