diff --git a/src/apps/login/DesktopWindow.cpp b/src/apps/login/DesktopWindow.cpp
index f28bd6c06a..374f83896b 100644
--- a/src/apps/login/DesktopWindow.cpp
+++ b/src/apps/login/DesktopWindow.cpp
@@ -14,6 +14,7 @@
 #include <Path.h>
 #include <Screen.h>
 #include <View.h>
+#include <WindowPrivate.h>
 
 #include "LoginApp.h"
 #include "DesktopWindow.h"
@@ -21,15 +22,11 @@
 #undef B_TRANSLATION_CONTEXT
 #define B_TRANSLATION_CONTEXT "Desktop Window"
 
-const window_feel kPrivateDesktopWindowFeel = window_feel(1024);
-const window_look kPrivateDesktopWindowLook = window_look(4);
-	// this is a mirror of an app server private values
-
 
 DesktopWindow::DesktopWindow(BRect frame, bool editMode)
-	: BWindow(frame, B_TRANSLATE("Desktop"), 
-		kPrivateDesktopWindowLook, 
-		kPrivateDesktopWindowFeel, 
+	: BWindow(frame, B_TRANSLATE("Desktop"),
+		kDesktopWindowLook,
+		kDesktopWindowFeel,
 		B_NOT_MOVABLE | B_NOT_CLOSABLE | B_NOT_ZOOMABLE
 		 | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE
 		 | B_ASYNCHRONOUS_CONTROLS,
diff --git a/src/apps/login/Jamfile b/src/apps/login/Jamfile
index c3d0743787..0290dcccf2 100644
--- a/src/apps/login/Jamfile
+++ b/src/apps/login/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src apps login ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-UsePrivateHeaders app ;
+UsePrivateHeaders app interface ;
 #UsePrivateHeaders shared ;
 #UsePrivateHeaders tracker ;
 #SubDirHdrs $(HAIKU_TOP) src kits tracker ;
diff --git a/src/kits/interface/ControlLook.cpp b/src/kits/interface/ControlLook.cpp
index 642d300c20..bc6f7982af 100644
--- a/src/kits/interface/ControlLook.cpp
+++ b/src/kits/interface/ControlLook.cpp
@@ -13,6 +13,7 @@
 
 #include <algorithm>
 
+#include <Bitmap.h>
 #include <Control.h>
 #include <GradientLinear.h>
 #include <LayoutUtils.h>
@@ -21,8 +22,7 @@
 #include <String.h>
 #include <View.h>
 #include <Window.h>
-
-#include "ContainerWindow.h"
+#include <WindowPrivate.h>
 
 
 namespace BPrivate {
@@ -1790,8 +1790,8 @@ BControlLook::DrawLabel(BView* view, const char* label, const rgb_color& base,
 
 	BWindow* window = view->Window();
 	bool isDesktop = window
-		&& window->Feel() == kPrivateDesktopWindowFeel
-		&& window->Look() == kPrivateDesktopWindowLook
+		&& window->Feel() == kDesktopWindowFeel
+		&& window->Look() == kDesktopWindowLook
 		&& view->Parent()
 		&& view->Parent()->Parent() == NULL
 		&& (flags & B_IGNORE_OUTLINE) == 0;
diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index b838be1e97..c6f33d6111 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -58,6 +58,7 @@ All rights reserved.
 #include <UnicodeChar.h>
 #include <Volume.h>
 #include <VolumeRoster.h>
+#include <WindowPrivate.h>
 
 #include <fs_attr.h>
 #include <image.h>
@@ -585,7 +586,7 @@ BContainerWindow::~BContainerWindow()
 BRect
 BContainerWindow::InitialWindowRect(window_feel feel)
 {
-	if (feel != kPrivateDesktopWindowFeel)
+	if (feel != kDesktopWindowFeel)
 		return sNewWindRect;
 
 	// do not offset desktop window
diff --git a/src/kits/tracker/ContainerWindow.h b/src/kits/tracker/ContainerWindow.h
index 58b8d205e6..39fd9a225f 100644
--- a/src/kits/tracker/ContainerWindow.h
+++ b/src/kits/tracker/ContainerWindow.h
@@ -70,10 +70,6 @@ class SelectionWindow;
 
 extern const char* kAddOnsMenuName;
 
-const window_feel kPrivateDesktopWindowFeel = window_feel(1024);
-const window_look kPrivateDesktopWindowLook = window_look(4);
-	// this is a mirror of an app server private values
-
 
 enum {
 	// flags that describe opening of the window
diff --git a/src/kits/tracker/DeskWindow.cpp b/src/kits/tracker/DeskWindow.cpp
index 808211cbb2..9e357303cd 100644
--- a/src/kits/tracker/DeskWindow.cpp
+++ b/src/kits/tracker/DeskWindow.cpp
@@ -50,6 +50,7 @@ All rights reserved.
 #include <String.h>
 #include <StringList.h>
 #include <Volume.h>
+#include <WindowPrivate.h>
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -186,8 +187,8 @@ LoadAddOnDir(BDirectory directory, BDeskWindow* window,
 
 BDeskWindow::BDeskWindow(LockingList<BWindow>* windowList)
 	:
-	BContainerWindow(windowList, 0, kPrivateDesktopWindowLook,
-		kPrivateDesktopWindowFeel, B_NOT_MOVABLE | B_WILL_ACCEPT_FIRST_CLICK
+	BContainerWindow(windowList, 0, kDesktopWindowLook,
+		kDesktopWindowFeel, B_NOT_MOVABLE | B_WILL_ACCEPT_FIRST_CLICK
 			| B_NOT_ZOOMABLE | B_NOT_CLOSABLE | B_NOT_MINIMIZABLE
 			| B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS, B_ALL_WORKSPACES,
 			false, true),
diff --git a/src/kits/tracker/SelectionWindow.cpp b/src/kits/tracker/SelectionWindow.cpp
index 8d3a9874d4..c87463ee63 100644
--- a/src/kits/tracker/SelectionWindow.cpp
+++ b/src/kits/tracker/SelectionWindow.cpp
@@ -39,6 +39,7 @@ All rights reserved.
 #include <Locale.h>
 #include <MenuItem.h>
 #include <MessageFilter.h>
+#include <WindowPrivate.h>
 
 #include "AutoLock.h"
 #include "ContainerWindow.h"
@@ -65,7 +66,7 @@ SelectionWindow::SelectionWindow(BContainerWindow* window)
 			| B_NOT_ANCHORED_ON_ACTIVATE),
 	fParentWindow(window)
 {
-	if (window->Feel() & kPrivateDesktopWindowFeel) {
+	if (window->Feel() & kDesktopWindowFeel) {
 		// The window will not show up if we have
 		// B_FLOATING_SUBSET_WINDOW_FEEL and use it with the desktop window
 		// since it's never in front.