diff --git a/src/preferences/appearance/APRView.cpp b/src/preferences/appearance/APRView.cpp
index bbe2863814..917a7cf459 100644
--- a/src/preferences/appearance/APRView.cpp
+++ b/src/preferences/appearance/APRView.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009, Haiku. All rights reserved.
+ * Copyright 2002-2011, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -7,8 +7,11 @@
  *		Rene Gollent (rene@gollent.com)
  */
 
+
 #include "APRView.h"
 
+#include <stdio.h>
+
 #include <Alert.h>
 #include <Catalog.h>
 #include <Directory.h>
@@ -20,10 +23,7 @@
 #include <Path.h>
 #include <SpaceLayoutItem.h>
 
-#include <private/interface/DecorInfo.h>
-
-#include <stdio.h>
-
+#include <DecorInfo.h>
 
 #include "APRWindow.h"
 #include "defs.h"
diff --git a/src/preferences/appearance/APRView.h b/src/preferences/appearance/APRView.h
index e51ed2db1f..0f44f20d5a 100644
--- a/src/preferences/appearance/APRView.h
+++ b/src/preferences/appearance/APRView.h
@@ -9,36 +9,38 @@
 #ifndef APR_VIEW_H_
 #define APR_VIEW_H_
 
-#include <View.h>
+
+#include <Button.h>
 #include <ColorControl.h>
-#include <Message.h>
 #include <ListItem.h>
 #include <ListView.h>
-#include <Button.h>
-#include <ScrollView.h>
-#include <ScrollBar.h>
-#include <String.h>
 #include <Menu.h>
-#include <MenuField.h>
 #include <MenuBar.h>
+#include <MenuField.h>
 #include <MenuItem.h>
+#include <Message.h>
+#include <ScrollBar.h>
+#include <ScrollView.h>
+#include <String.h>
 #include <StringView.h>
-#include <Invoker.h>
+#include <View.h>
+
+#include <DecorInfo.h>
 
 #include "ColorSet.h"
 
+
 class ColorWell;
-class DecorInfoUtility;
 class APRWindow;
 
-class APRView : public BView
-{
+
+class APRView : public BView {
 public:
 			APRView(const char *name, uint32 flags);
 			~APRView(void);
 	void	AttachedToWindow(void);
 	void	MessageReceived(BMessage *msg);
-	
+
 	void	LoadSettings(void);
 	bool	IsDefaultable(void);
 
@@ -47,21 +49,21 @@ protected:
 	void	SetCurrentColor(rgb_color color);
 	void	UpdateControls();
 	void	UpdateAllColors();
-	
+
 	BColorControl	*fPicker;
-	
+
 	BListView		*fAttrList;
-	
+
 	color_which		fWhich;
-	
+
 	BScrollView		*fScrollView;
-	
+
 	ColorWell		*fColorWell;
 
 	ColorSet		fCurrentSet;
 	ColorSet		fPrevSet;
 	ColorSet		fDefaultSet;
-	
+
 	BMenu			*fDecorMenu;
 	DecorInfoUtility*fDecorUtil;
 };
diff --git a/src/preferences/appearance/Jamfile b/src/preferences/appearance/Jamfile
index 4154204884..63eafa0d93 100644
--- a/src/preferences/appearance/Jamfile
+++ b/src/preferences/appearance/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src preferences appearance ;
 
-UsePrivateHeaders app [ FDirName servers app ] ;
+UsePrivateHeaders app interface [ FDirName servers app ] ;
 UseFreeTypeHeaders ;
 
 Preference Appearance :
@@ -11,17 +11,17 @@ Preference Appearance :
 	ColorSet.cpp
 	ColorWell.cpp
 	ColorWhichItem.cpp
-	
+
 	# These are currently disabled while everything else is being worked on
 	#CurView.cpp
 	#CursorWhichItem.cpp
 	#DecView.cpp
 	#SysCursorAPI.cpp
-	
+
 	# These exist for post-R1, so they are disabled for now
 	#FontMenu.cpp
 	#MenuView.cpp
-	
+
 	: be $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS)
 	: Appearance.rdef
 	;