diff --git a/src/kits/tracker/SettingsViews.cpp b/src/kits/tracker/SettingsViews.cpp
index 3d12d1cb8e..2c82aa6ca1 100644
--- a/src/kits/tracker/SettingsViews.cpp
+++ b/src/kits/tracker/SettingsViews.cpp
@@ -32,26 +32,29 @@ names are registered trademarks or trademarks of their respective holders.
 All rights reserved.
 */
 
-#include <Alert.h>
 
-#include "Commands.h"
-#include "DeskWindow.h"
-#include "Model.h"
 #include "SettingsViews.h"
-#include "Tracker.h"
-#include "WidgetAttributeText.h"
 
 #include <Box.h>
 #include <Button.h>
 #include <Catalog.h>
+#include <CheckBox.h>
+#include <ColorControl.h>
 #include <ControlLook.h>
 #include <LayoutBuilder.h>
 #include <Locale.h>
 #include <MenuField.h>
-#include <ColorControl.h>
 #include <NodeMonitor.h>
+#include <Point.h>
+#include <RadioButton.h>
 #include <StringView.h>
 
+#include "Commands.h"
+#include "DeskWindow.h"
+#include "Model.h"
+#include "Tracker.h"
+#include "WidgetAttributeText.h"
+
 
 static const uint32 kSpaceBarSwitchColor = 'SBsc';
 static const float kItemExtraSpacing = 2.0f;
diff --git a/src/kits/tracker/SettingsViews.h b/src/kits/tracker/SettingsViews.h
index 68ce03484f..9b675e8641 100644
--- a/src/kits/tracker/SettingsViews.h
+++ b/src/kits/tracker/SettingsViews.h
@@ -35,19 +35,19 @@ All rights reserved.
 #define _SETTINGS_VIEWS
 
 
-#include <CheckBox.h>
 #include <GroupView.h>
-#include <RadioButton.h>
-#include <TextControl.h>
-#include <ColorControl.h>
 
 #include "TrackerSettings.h"
 
 
 const uint32 kSettingsContentsModified = 'Scmo';
 
+
 class BButton;
+class BCheckBox;
+class BColorControl;
 class BMenuField;
+class BRadioButton;
 class BStringView;