diff --git a/src/servers/app/Layer.cpp b/src/servers/app/Layer.cpp
index b129285260..ee1f70493c 100644
--- a/src/servers/app/Layer.cpp
+++ b/src/servers/app/Layer.cpp
@@ -1489,10 +1489,10 @@ void
 Layer::AddToViewsWithInvalidCoords() const
 {
 	if (fServerWin) {
-		fServerWin->fClientViewsWithInvalidCoords.AddInt32("_token", fViewToken);
-		fServerWin->fClientViewsWithInvalidCoords.AddPoint("where", fFrame.LeftTop());
-		fServerWin->fClientViewsWithInvalidCoords.AddFloat("width", fFrame.Width());
-		fServerWin->fClientViewsWithInvalidCoords.AddFloat("height", fFrame.Height());
+		fServerWin->ClientViewsWithInvalidCoords().AddInt32("_token", fViewToken);
+		fServerWin->ClientViewsWithInvalidCoords().AddPoint("where", fFrame.LeftTop());
+		fServerWin->ClientViewsWithInvalidCoords().AddFloat("width", fFrame.Width());
+		fServerWin->ClientViewsWithInvalidCoords().AddFloat("height", fFrame.Height());
 	}
 }
 
@@ -1500,9 +1500,9 @@ Layer::AddToViewsWithInvalidCoords() const
 void
 Layer::SendViewCoordUpdateMsg() const
 {
-	if (fServerWin && !fServerWin->fClientViewsWithInvalidCoords.IsEmpty()) {
-		fServerWin->SendMessageToClient(&fServerWin->fClientViewsWithInvalidCoords);
-		fServerWin->fClientViewsWithInvalidCoords.MakeEmpty();
+	if (fServerWin && !fServerWin->ClientViewsWithInvalidCoords().IsEmpty()) {
+		fServerWin->SendMessageToClient(&fServerWin->ClientViewsWithInvalidCoords());
+		fServerWin->ClientViewsWithInvalidCoords().MakeEmpty();
 	}
 }
 
diff --git a/src/servers/app/ServerWindow.h b/src/servers/app/ServerWindow.h
index ed88f5cb8e..0d11730415 100644
--- a/src/servers/app/ServerWindow.h
+++ b/src/servers/app/ServerWindow.h
@@ -97,7 +97,11 @@ public:
 			void				SendMessageToClient(const BMessage* msg,
 													int32 target = B_NULL_TOKEN,
 													bool usePreferred = false) const;
-
+			
+			// TODO: Ouch, that's not exactly a nice name
+			inline BMessage		&ClientViewsWithInvalidCoords()
+									{ return fClientViewsWithInvalidCoords; };
+		
 			// to who we belong. who do we own. our title.
 	inline	ServerApp*			App(void) const { return fServerApp; }
 	inline	const WinBorder*	GetWinBorder(void) const { return fWinBorder; }
@@ -113,6 +117,8 @@ public:
 			FMWList fWinFMWList;
 
 private:
+	friend class WinBorder;
+	
 			// methods for retrieving and creating a tree strcture of Layers.
 			Layer*				CreateLayerTree(Layer *localRoot, LinkMsgReader &link);
 			void				SetLayerState(Layer *layer, LinkMsgReader &link);
@@ -131,9 +137,7 @@ private:
 										  BRect& dirty,
 										  int32 xOffset, int32 yOffset) const;
 
-protected:	
-	friend class WinBorder;
-	friend class Layer;
+	
 			// TODO: Move me elsewhere
 			status_t			PictureToRegion(ServerPicture *picture,
 												BRegion &,