diff --git a/headers/private/servers/app/DisplayDriver.h b/headers/private/servers/app/DisplayDriver.h
index aee25cefa2..381e3c9e69 100644
--- a/headers/private/servers/app/DisplayDriver.h
+++ b/headers/private/servers/app/DisplayDriver.h
@@ -35,8 +35,6 @@
 #include <Font.h>
 #include <Locker.h>
 
-#include "CursorHandler.h"
-
 class BPoint;
 class BRect;
 class BRegion;
diff --git a/src/servers/app/Jamfile b/src/servers/app/Jamfile
index 3b37ff5049..f654a8bdaf 100644
--- a/src/servers/app/Jamfile
+++ b/src/servers/app/Jamfile
@@ -51,10 +51,8 @@ SharedLibrary appserver :
 	CursorData.cpp
 	Decorator.cpp
 	FontFamily.cpp
-	GraphicsBuffer.cpp
 	IPoint.cpp
 	LayerData.cpp
-	RectUtils.cpp
 	RGBColor.cpp
 	ServerBitmap.cpp
 	ServerCursor.cpp
diff --git a/src/servers/app/RootLayer.h b/src/servers/app/RootLayer.h
index 4be5f83e09..035d8210af 100644
--- a/src/servers/app/RootLayer.h
+++ b/src/servers/app/RootLayer.h
@@ -33,7 +33,6 @@
 
 #include "Layer.h"
 #include "FMWList.h"
-#include "CursorHandler.h"
 #include "CursorManager.h"
 #include "Workspace.h"
 
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 698bbffb4f..251ec06d75 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -48,6 +48,7 @@
 #include "TokenHandler.h"
 #include "Utils.h"
 #include "DisplayDriver.h"
+#include "ServerBitmap.h"
 #include "ServerPicture.h"
 #include "Workspace.h"
 #include "MessagePrivate.h"
diff --git a/src/servers/app/drawing/DisplayDriverPainter.cpp b/src/servers/app/drawing/DisplayDriverPainter.cpp
index 81dca9b2d9..e55493fbce 100644
--- a/src/servers/app/drawing/DisplayDriverPainter.cpp
+++ b/src/servers/app/drawing/DisplayDriverPainter.cpp
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <algo.h>
 
+#include "LayerData.h"
 #include "Painter.h"
 #include "RenderingBuffer.h"
 
diff --git a/src/servers/app/Clipper.cpp b/src/servers/app/drawing/old_but_informative/Clipper.cpp
similarity index 100%
rename from src/servers/app/Clipper.cpp
rename to src/servers/app/drawing/old_but_informative/Clipper.cpp
diff --git a/src/servers/app/Clipper.h b/src/servers/app/drawing/old_but_informative/Clipper.h
similarity index 100%
rename from src/servers/app/Clipper.h
rename to src/servers/app/drawing/old_but_informative/Clipper.h
diff --git a/src/servers/app/CursorHandler.cpp b/src/servers/app/drawing/old_but_informative/CursorHandler.cpp
similarity index 100%
rename from src/servers/app/CursorHandler.cpp
rename to src/servers/app/drawing/old_but_informative/CursorHandler.cpp
diff --git a/headers/private/servers/app/CursorHandler.h b/src/servers/app/drawing/old_but_informative/CursorHandler.h
similarity index 100%
rename from headers/private/servers/app/CursorHandler.h
rename to src/servers/app/drawing/old_but_informative/CursorHandler.h
diff --git a/src/servers/app/GraphicsBuffer.cpp b/src/servers/app/drawing/old_but_informative/GraphicsBuffer.cpp
similarity index 100%
rename from src/servers/app/GraphicsBuffer.cpp
rename to src/servers/app/drawing/old_but_informative/GraphicsBuffer.cpp
diff --git a/headers/private/servers/app/GraphicsBuffer.h b/src/servers/app/drawing/old_but_informative/GraphicsBuffer.h
similarity index 100%
rename from headers/private/servers/app/GraphicsBuffer.h
rename to src/servers/app/drawing/old_but_informative/GraphicsBuffer.h
diff --git a/headers/private/servers/app/PixelRenderer.h b/src/servers/app/drawing/old_but_informative/PixelRenderer.h
similarity index 100%
rename from headers/private/servers/app/PixelRenderer.h
rename to src/servers/app/drawing/old_but_informative/PixelRenderer.h
diff --git a/src/servers/app/RectUtils.cpp b/src/servers/app/drawing/old_but_informative/RectUtils.cpp
similarity index 100%
rename from src/servers/app/RectUtils.cpp
rename to src/servers/app/drawing/old_but_informative/RectUtils.cpp
diff --git a/headers/private/servers/app/RectUtils.h b/src/servers/app/drawing/old_but_informative/RectUtils.h
similarity index 100%
rename from headers/private/servers/app/RectUtils.h
rename to src/servers/app/drawing/old_but_informative/RectUtils.h