diff --git a/src/servers/app/AppServer.cpp b/src/servers/app/AppServer.cpp
index 5e36c4c366..3a0a8570d4 100644
--- a/src/servers/app/AppServer.cpp
+++ b/src/servers/app/AppServer.cpp
@@ -13,38 +13,14 @@
 
 #include "BitmapManager.h"
 #include "ColorSet.h"
-#include "CursorManager.h"
-#include "DecorManager.h"
-#include "DefaultDecorator.h"
 #include "Desktop.h"
 #include "FontManager.h"
-#include "HWInterface.h"
 #include "InputManager.h"
-//#include "Layer.h"
-#include "RGBColor.h"
-#include "RegistrarDefs.h"
-//#include "RootLayer.h"
 #include "ScreenManager.h"
-#include "ServerApp.h"
-#include "ServerConfig.h"
-#include "ServerCursor.h"
 #include "ServerProtocol.h"
-#include "ServerWindow.h"
 #include "SystemPalette.h"
 
-#include <Accelerant.h>
-#include <AppDefs.h>
-#include <Autolock.h>
-#include <Directory.h>
-#include <Entry.h>
-#include <File.h>
-#include <Message.h>
-#include <Path.h>
 #include <PortLink.h>
-#include <RosterPrivate.h>
-#include <StopWatch.h>
-
-#include <unistd.h>
 
 
 //#define DEBUG_SERVER
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index 59dcf70a36..762631abc2 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -1404,7 +1404,6 @@ ServerWindow::_DispatchViewMessage(int32 code,
 		{
 			DTRACE(("ServerWindow %s: Message AS_LAYER_CLIP_TO_PICTURE: ViewLayer: %s\n", Title(), fCurrentLayer->Name()));
 		// TODO: you are not allowed to use ViewLayer regions here!!!
-		// If there is no other way, then first lock RootLayer object first.
 			
 			int32 pictureToken;
 			BPoint where;
diff --git a/src/servers/app/ServerWindow.h b/src/servers/app/ServerWindow.h
index c957a4a7a5..e75a247331 100644
--- a/src/servers/app/ServerWindow.h
+++ b/src/servers/app/ServerWindow.h
@@ -37,7 +37,6 @@ class ServerApp;
 class Decorator;
 class WindowLayer;
 class Workspace;
-class RootLayer;
 class ViewLayer;
 class ServerPicture;
 struct dw_data;
diff --git a/src/servers/app/Workspace.h b/src/servers/app/Workspace.h
index efd116575b..4db551ed68 100644
--- a/src/servers/app/Workspace.h
+++ b/src/servers/app/Workspace.h
@@ -14,7 +14,6 @@
 
 class Desktop;
 class RGBColor;
-class RootLayer;
 class WindowLayer;