A bit of include cleanup

src/plugins/texteditor/basetexteditor.cpp

@@ -38,6 +38,7 @@
 #include "basetextdocument.h"
 #include "basetexteditor_p.h"
 #include "codecselector.h"
+#include "tabsettings.h"
 
 #ifndef TEXTEDITOR_STANDALONE
 #include <aggregation/aggregate.h>

src/plugins/texteditor/basetexteditor.h

@@ -30,13 +30,12 @@
 #ifndef BASETEXTEDITOR_H
 #define BASETEXTEDITOR_H
 
-#include "displaysettings.h"
-#include "tabsettings.h"
 #include "itexteditable.h"
 
 #include <find/ifindsupport.h>
 
 #include <QtGui/QPlainTextEdit>
+#include <QtGui/QTextBlockUserData>
 
 QT_BEGIN_NAMESPACE
 class QKeyEvent;
@@ -63,7 +62,9 @@ class TextEditorActionHandler;
 class BaseTextDocument;
 class FontSettings;
 struct BehaviorSettings;
+struct DisplaySettings;
 struct StorageSettings;
+struct TabSettings;
 
 struct Parenthesis;
 typedef QVector<Parenthesis> Parentheses;

src/plugins/texteditor/basetexteditor_p.h

@@ -31,8 +31,10 @@
 #define BASETEXTEDITOR_P_H
 
 #include "basetexteditor.h"
+#include "displaysettings.h"
 #include "texteditoroverlay.h"
-#include <texteditor/fontsettings.h>
+#include "fontsettings.h"
+
 #include <utils/changeset.h>
 
 #include <QtCore/QBasicTimer>

src/plugins/texteditor/plaintexteditor.cpp

@@ -28,6 +28,7 @@
 **************************************************************************/
 
 #include "plaintexteditor.h"
+#include "tabsettings.h"
 #include "texteditorconstants.h"
 #include "texteditorplugin.h"
 

src/plugins/texteditor/texteditoractionhandler.cpp

@@ -28,10 +28,12 @@
 **************************************************************************/
 
 #include "texteditoractionhandler.h"
-#include "texteditorconstants.h"
+
 #include "basetexteditor.h"
-#include "texteditorplugin.h"
+#include "displaysettings.h"
 #include "linenumberfilter.h"
+#include "texteditorconstants.h"
+#include "texteditorplugin.h"
 
 #include <locator/locatormanager.h>
 #include <coreplugin/icore.h>