diff --git a/src/servers/app/ServerPicture.cpp b/src/servers/app/ServerPicture.cpp
index 8d2a1b53fa..37223ea2fa 100644
--- a/src/servers/app/ServerPicture.cpp
+++ b/src/servers/app/ServerPicture.cpp
@@ -7,11 +7,14 @@
  *		Stefano Ceccherini (stefano.ceccherini@gmail.com)
  *		Marcus Overhagen <marcus@overhagen.de>
  */
-
-
 #include "ServerPicture.h"
 
+#include <new>
+#include <stdio.h>
+#include <stack>
+
 #include "DrawingEngine.h"
+#include "DrawState.h"
 #include "ServerApp.h"
 #include "ServerBitmap.h"
 #include "ServerFont.h"
@@ -32,10 +35,6 @@
 #include <List.h>
 #include <Shape.h>
 
-#include <new>
-#include <stdio.h>
-#include <stack>
-
 
 using std::stack;
 
diff --git a/src/servers/app/ServerWindow.cpp b/src/servers/app/ServerWindow.cpp
index cb1f0a8e00..dac8009c4d 100644
--- a/src/servers/app/ServerWindow.cpp
+++ b/src/servers/app/ServerWindow.cpp
@@ -56,6 +56,7 @@
 #include "Desktop.h"
 #include "DirectWindowInfo.h"
 #include "DrawingEngine.h"
+#include "DrawState.h"
 #include "HWInterface.h"
 #include "Overlay.h"
 #include "ProfileMessageSupport.h"
diff --git a/src/servers/app/View.cpp b/src/servers/app/View.cpp
index 2be4c66e48..0982f52844 100644
--- a/src/servers/app/View.cpp
+++ b/src/servers/app/View.cpp
@@ -9,13 +9,15 @@
  *		Stephan Aßmus <superstippi@gmx.de>
  *		Marcus Overhagen <marcus@overhagen.de>
  */
-
-
 #include "View.h"
 
+#include <new>
+#include <stdio.h>
+
 #include "BitmapManager.h"
 #include "Desktop.h"
 #include "DrawingEngine.h"
+#include "DrawState.h"
 #include "Overlay.h"
 #include "ServerApp.h"
 #include "ServerBitmap.h"
@@ -38,9 +40,6 @@
 #include <GradientDiamond.h>
 #include <GradientConic.h>
 
-#include <stdio.h>
-
-#include <new>
 
 using std::nothrow;
 
diff --git a/src/servers/app/WorkspacesView.cpp b/src/servers/app/WorkspacesView.cpp
index c8495fc1a2..efcf439ef2 100644
--- a/src/servers/app/WorkspacesView.cpp
+++ b/src/servers/app/WorkspacesView.cpp
@@ -11,8 +11,10 @@
 #include "WorkspacesView.h"
 
 #include "AppServer.h"
+#include "Decorator.h"
 #include "Desktop.h"
 #include "DrawingEngine.h"
+#include "DrawState.h"
 #include "ServerApp.h"
 #include "Window.h"
 #include "Workspace.h"