diff --git a/src/servers/app/server/ServerApp.cpp b/src/servers/app/server/ServerApp.cpp
index 94ce80eda2..b531f36e85 100644
--- a/src/servers/app/server/ServerApp.cpp
+++ b/src/servers/app/server/ServerApp.cpp
@@ -274,7 +274,8 @@ void ServerApp::WindowBroadcast(int32 code)
 	for(int32 i=0; i<count; i++)
 	{
 		ServerWindow *sw = ((WinBorder*)desktop->fWinBorderList.ItemAt(i))->Window();
-		sw->PostMessage(code);
+		BMessage		msg(B_QUIT_REQUESTED);
+		sw->SendMessageToClient(&msg);
 	}
 	desktop->fLayerLock.Unlock();
 }
@@ -517,7 +518,7 @@ void ServerApp::_DispatchMessage(PortMessage *msg)
 			msg->Read<port_id>(&looperPort);
 			msg->ReadString(&title);
 			msg->Read<port_id>(&replyport);
-			
+
 			STRACE(("ServerApp %s: Got 'New Window' message, trying to do smething...\n",fSignature.String()));
 
 			// ServerWindow constructor will reply with port_id of a newly created port
diff --git a/src/servers/app/server/ServerApp.h b/src/servers/app/server/ServerApp.h
index 59f41e1a62..53249e5dff 100644
--- a/src/servers/app/server/ServerApp.h
+++ b/src/servers/app/server/ServerApp.h
@@ -39,6 +39,7 @@ class PortMessage;
 class BList;
 class DisplayDriver;
 class ServerCursor;
+class ServerBitmap;
 
 /*!
 	\class ServerApp ServerApp.h
@@ -81,7 +82,7 @@ protected:
 	friend class ServerWindow;
 	
 	void _DispatchMessage(PortMessage *msg);
-	ServerBitmap *_FindBitmap(int32 token);
+	ServerBitmap* _FindBitmap(int32 token);
 	
 	port_id	fClientAppPort,
 			fMessagePort,