diff --git a/src/kits/interface/PrivateScreen.h b/headers/private/interface/PrivateScreen.h
similarity index 100%
rename from src/kits/interface/PrivateScreen.h
rename to headers/private/interface/PrivateScreen.h
diff --git a/src/kits/interface/PrivateScreen.cpp b/src/kits/interface/PrivateScreen.cpp
index 6ef3188ecb..dd57300a23 100644
--- a/src/kits/interface/PrivateScreen.cpp
+++ b/src/kits/interface/PrivateScreen.cpp
@@ -13,10 +13,7 @@
 */
 
 
-#include "AppMisc.h"
-#include "AppServerLink.h"
-#include "PrivateScreen.h"
-#include "ServerProtocol.h"
+#include <PrivateScreen.h>
 
 #include <new>
 #include <stdlib.h>
@@ -28,6 +25,10 @@
 #include <ObjectList.h>
 #include <Window.h>
 
+#include <AppMisc.h>
+#include <AppServerLink.h>
+#include <ServerProtocol.h>
+
 
 using namespace BPrivate;
 
diff --git a/src/kits/interface/Screen.cpp b/src/kits/interface/Screen.cpp
index 0ebc403378..7c75a55373 100644
--- a/src/kits/interface/Screen.cpp
+++ b/src/kits/interface/Screen.cpp
@@ -11,11 +11,12 @@
 /*!	BScreen lets you retrieve and change the display settings. */
 
 
-#include "PrivateScreen.h"
-
 #include <Screen.h>
+
 #include <Window.h>
 
+#include <PrivateScreen.h>
+
 
 using namespace BPrivate;
 
diff --git a/src/servers/app/Desktop.cpp b/src/servers/app/Desktop.cpp
index 4bf52158e1..d2c8a7b825 100644
--- a/src/servers/app/Desktop.cpp
+++ b/src/servers/app/Desktop.cpp
@@ -15,6 +15,23 @@
 
 #include "Desktop.h"
 
+#include <stdio.h>
+#include <string.h>
+#include <syslog.h>
+
+#include <Debug.h>
+#include <DirectWindow.h>
+#include <Entry.h>
+#include <Message.h>
+#include <MessageFilter.h>
+#include <Region.h>
+#include <Roster.h>
+
+#include <PrivateScreen.h>
+#include <ServerProtocol.h>
+#include <ViewPrivate.h>
+#include <WindowInfo.h>
+
 #include "AppServer.h"
 #include "DesktopSettingsPrivate.h"
 #include "DrawingEngine.h"
@@ -31,26 +48,11 @@
 #include "Workspace.h"
 #include "WorkspacesView.h"
 
-#include <ViewPrivate.h>
-#include <WindowInfo.h>
-#include <ServerProtocol.h>
-
-#include <Debug.h>
-#include <DirectWindow.h>
-#include <Entry.h>
-#include <Message.h>
-#include <MessageFilter.h>
-#include <Region.h>
-#include <Roster.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-
 #if TEST_MODE
 #	include "EventStream.h"
 #endif
 
+
 //#define DEBUG_DESKTOP
 #ifdef DEBUG_DESKTOP
 #	define STRACE(a) printf a
@@ -1125,8 +1127,7 @@ status_t
 Desktop::SetScreenMode(int32 workspace, int32 id, const display_mode& mode,
 	bool makeDefault)
 {
-	// ~0 is used as the current workspace in PrivateScreen
-	if (workspace == ~0)
+	if (workspace == B_CURRENT_WORKSPACE_INDEX)
 		workspace = fCurrentWorkspace;
 
 	if (workspace < 0 || workspace > kMaxWorkspaces)
@@ -1184,8 +1185,7 @@ Desktop::SetScreenMode(int32 workspace, int32 id, const display_mode& mode,
 status_t
 Desktop::GetScreenMode(int32 workspace, int32 id, display_mode& mode)
 {
-	// ~0 is used as the current workspace in PrivateScreen
-	if (workspace == ~0)
+	if (workspace == B_CURRENT_WORKSPACE_INDEX)
 		workspace = fCurrentWorkspace;
 
 	if (workspace < 0 || workspace > kMaxWorkspaces)