diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index c7161c7f6..52207557b 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -61,14 +61,14 @@
 #include "qt_x11_p.h"
 #endif
 
-#include <unistd.h>
-
 #ifndef QT_NO_FONTCONFIG
 #include <fontconfig/fontconfig.h>
 #endif
 
 #include <harfbuzz-shaper.h>
 
+#include <unistd.h>
+
 QT_BEGIN_NAMESPACE
 
 /*
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index 55200f699..6e795f086 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-#include "QtCore/qglobal.h"
 #include "QtCore/qatomic.h"
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/QLinkedList>
@@ -87,9 +86,7 @@ public:
         Box,
         Multi,
 
-        // QWS types
         Freetype,
-        Proxy,
 
         TestFontEngine = 0x1000
     };
diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 93cb8b7fb..6bd2ea0f9 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -45,8 +45,7 @@
 #include <qfontengine_p.h>
 #include <qfontmetrics.h>
 #include <qabstracttextdocumentlayout.h>
-
-#include <QtGui/qapplication.h>
+#include <qapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index 0b18d1e13..9b96d531e 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 class Q_GUI_EXPORT QStaticTextItem
 {
 public:
-    QStaticTextItem() : chars(0), numChars(0), m_fontEngine(0) {}
+    QStaticTextItem() : chars(Q_NULLPTR), numChars(0), m_fontEngine(Q_NULLPTR) {}
 
     QStaticTextItem(const QStaticTextItem &other)
     {
@@ -80,7 +80,7 @@ public:
         font = other.font;
         color = other.color;
 
-        m_fontEngine = 0;
+        m_fontEngine = Q_NULLPTR;
         setFontEngine(other.fontEngine());
     }
 
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 6b9df93b0..812353089 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -120,7 +120,7 @@ QTextControlPrivate::QTextControlPrivate()
 #ifndef QT_NO_DRAGANDDROP
       mousePressed(false), mightStartDrag(false),
 #endif
-      lastSelectionState(false), ignoreAutomaticScrollbarAdjustement(false),
+      lastSelectionState(false),
       overwriteMode(false),
       acceptRichText(true),
       preeditCursor(0), hideCursor(false),
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h
index 77e3b226f..1840d4255 100644
--- a/src/gui/text/qtextcontrol_p.h
+++ b/src/gui/text/qtextcontrol_p.h
@@ -69,13 +69,9 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-
-class QStyleSheet;
 class QTextDocument;
-class QMenu;
 class QTextControlPrivate;
 class QMimeData;
-class QAbstractScrollArea;
 class QEvent;
 class QTimerEvent;
 
diff --git a/src/gui/text/qtextcontrol_p_p.h b/src/gui/text/qtextcontrol_p_p.h
index 910f6c099..b44a9ce13 100644
--- a/src/gui/text/qtextcontrol_p_p.h
+++ b/src/gui/text/qtextcontrol_p_p.h
@@ -66,7 +66,6 @@
 QT_BEGIN_NAMESPACE
 
 class QMimeData;
-class QAbstractScrollArea;
 
 class QTextControlPrivate : public QObjectPrivate
 {
@@ -87,9 +86,9 @@ public:
     void createAutoBulletList();
 
     void init(Qt::TextFormat format = Qt::RichText, const QString &text = QString(),
-              QTextDocument *document = 0);
+              QTextDocument *document = Q_NULLPTR);
     void setContent(Qt::TextFormat format = Qt::RichText, const QString &text = QString(),
-                    QTextDocument *document = 0);
+                    QTextDocument *document = Q_NULLPTR);
     void startDrag();
 
     void paste(const QMimeData *source);
@@ -188,8 +187,6 @@ public:
 
     bool lastSelectionState;
 
-    bool ignoreAutomaticScrollbarAdjustement;
-
     QTextCursor selectedWordOnDoubleClick;
     QTextCursor selectedBlockOnTrippleClick;
 
diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index 6e787e939..03b664838 100644
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -140,9 +140,15 @@ enum QTextHTMLElements {
 
 struct QTextHtmlElement
 {
+    enum DisplayMode {
+        DisplayBlock,
+        DisplayInline,
+        DisplayTable,
+        DisplayNone
+    };
     const char *name;
     QTextHTMLElements id;
-    enum DisplayMode { DisplayBlock, DisplayInline, DisplayTable, DisplayNone } displayMode;
+    DisplayMode displayMode;
 };
 
 class QTextHtmlParser;
diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h
index f9467c5d6..e1da1c063 100644
--- a/src/gui/text/qtextobject.h
+++ b/src/gui/text/qtextobject.h
@@ -246,7 +246,7 @@ public:
     void setLineCount(int count);
     int lineCount() const;
 
-    class Q_GUI_EXPORT iterator {
+    class iterator {
         const QTextDocumentPrivate *p;
         int b;
         int e;
diff --git a/src/shared/qclass_lib_map.h b/src/shared/qclass_lib_map.h
index 0ff98dae1..61c703c08 100644
--- a/src/shared/qclass_lib_map.h
+++ b/src/shared/qclass_lib_map.h
@@ -187,7 +187,6 @@ static const ClassInfoEntry qclass_lib_map[] = {
     { "QTextFrame", "QtGui/qtextobject.h"},
     { "QTextBlockUserData", "QtGui/qtextobject.h"},
     { "QTextBlock", "QtGui/qtextobject.h"},
-    { "iterator", "QtGui/qtextobject.h"},
     { "QTextFragment", "QtGui/qtextobject.h"},
     { "QTextOption", "QtGui/qtextoption.h"},
     { "Tab", "QtGui/qtextoption.h"},
@@ -700,6 +699,6 @@ static const ClassInfoEntry qclass_lib_map[] = {
     { "QFormBuilder", "QtUiTools/formbuilder.h"},
     { "QUiLoader", "QtUiTools/quiloader.h"},
 };
-static const int qclass_lib_count = 694;
+static const int qclass_lib_count = 693;
 
 #endif