diff --git a/src/core/io/qdatastream.h b/src/core/io/qdatastream.h
index 3a1c5ddaa..7d53d0e90 100644
--- a/src/core/io/qdatastream.h
+++ b/src/core/io/qdatastream.h
@@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE
 
 
 class QByteArray;
-class QIODevice;
 
 template <typename T> class QList;
 template <typename T> class QLinkedList;
diff --git a/src/core/io/qfile_p.h b/src/core/io/qfile_p.h
index c3508a378..1a83b7d65 100644
--- a/src/core/io/qfile_p.h
+++ b/src/core/io/qfile_p.h
@@ -54,7 +54,8 @@
 //
 
 #include "QtCore/qabstractfileengine.h"
-#include "qiodevice_p.h"
+#include "QtCore/qiodevice_p.h"
+#include "QtCore/qringbuffer_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/io/qiodevice_p.h b/src/core/io/qiodevice_p.h
index 9a2a9f16a..1a4c181f3 100644
--- a/src/core/io/qiodevice_p.h
+++ b/src/core/io/qiodevice_p.h
@@ -57,7 +57,6 @@
 #include "QtCore/qbytearray.h"
 #include "QtCore/qobjectdefs.h"
 #include "QtCore/qstring.h"
-#include "qringbuffer_p.h"
 #ifndef QT_NO_QOBJECT
 #include "qobject_p.h"
 #endif
diff --git a/src/core/io/qprocess.h b/src/core/io/qprocess.h
index 90fa52d98..e59b55cb8 100644
--- a/src/core/io/qprocess.h
+++ b/src/core/io/qprocess.h
@@ -42,7 +42,6 @@
 #ifndef QPROCESS_H
 #define QPROCESS_H
 
-#include <QtCore/qiodevice.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qshareddata.h>
 
diff --git a/src/core/io/qprocess_p.h b/src/core/io/qprocess_p.h
index 3953fa567..66b181aab 100644
--- a/src/core/io/qprocess_p.h
+++ b/src/core/io/qprocess_p.h
@@ -55,6 +55,7 @@
 
 #include "QtCore/qprocess.h"
 #include "QtCore/qiodevice_p.h"
+#include "QtCore/qringbuffer_p.h"
 #ifdef Q_OS_UNIX
 #include <qorderedmutexlocker_p.h>
 #endif
diff --git a/src/core/plugin/qlibrary_p.h b/src/core/plugin/qlibrary_p.h
index fd24d630f..194592776 100644
--- a/src/core/plugin/qlibrary_p.h
+++ b/src/core/plugin/qlibrary_p.h
@@ -57,8 +57,6 @@
 # include "QtCore/qt_windows.h"
 #endif
 #include "QtCore/qlibrary.h"
-#include "QtCore/qpointer.h"
-#include "QtCore/qstringlist.h"
 #include "QtCore/qplugin.h"
 #include "QtCore/qsharedpointer.h"
 
@@ -114,7 +112,6 @@ private:
     QAtomicInt libraryUnloadCount;
 
     enum {IsAPlugin, IsNotAPlugin, MightBeAPlugin } pluginState;
-    friend class QLibraryPrivateHasFriends;
 };
 
 QT_END_NAMESPACE
diff --git a/src/core/plugin/qlibrary_unix.cpp b/src/core/plugin/qlibrary_unix.cpp
index 73407c157..dc00274d0 100644
--- a/src/core/plugin/qlibrary_unix.cpp
+++ b/src/core/plugin/qlibrary_unix.cpp
@@ -42,7 +42,8 @@
 #include "qplatformdefs.h"
 
 #include <qfile.h>
-#include "qlibrary_p.h"
+#include <qstringlist.h>
+#include <qlibrary_p.h>
 #include <qcoreapplication.h>
 #include <qfilesystementry_p.h>
 
diff --git a/src/core/plugin/qplugin.h b/src/core/plugin/qplugin.h
index b095d7586..7de720cd3 100644
--- a/src/core/plugin/qplugin.h
+++ b/src/core/plugin/qplugin.h
@@ -42,7 +42,6 @@
 #ifndef QPLUGIN_H
 #define QPLUGIN_H
 
-#include <QtCore/qobject.h>
 #include <QtCore/qpointer.h>
 
 QT_BEGIN_HEADER
diff --git a/src/core/thread/qmutex_p.h b/src/core/thread/qmutex_p.h
index 90e32f85d..30fa5aa93 100644
--- a/src/core/thread/qmutex_p.h
+++ b/src/core/thread/qmutex_p.h
@@ -54,7 +54,6 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
 #include <QtCore/qnamespace.h>
 #include <QtCore/qmutex.h>
 
diff --git a/src/core/thread/qreadwritelock_p.h b/src/core/thread/qreadwritelock_p.h
index 87d02743f..db8df538f 100644
--- a/src/core/thread/qreadwritelock_p.h
+++ b/src/core/thread/qreadwritelock_p.h
@@ -53,7 +53,6 @@
 // We mean it.
 //
 
-#include <QtCore/qglobal.h>
 #include <QtCore/qhash.h>
 
 #ifndef QT_NO_THREAD
diff --git a/src/core/tools/qringbuffer_p.h b/src/core/tools/qringbuffer_p.h
index c45f289d5..2596afc5d 100644
--- a/src/core/tools/qringbuffer_p.h
+++ b/src/core/tools/qringbuffer_p.h
@@ -54,7 +54,6 @@
 //
 
 #include <QtCore/qbytearray.h>
-#include <QtCore/qlist.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/core/tools/qstringlist.h b/src/core/tools/qstringlist.h
index a0674b6e4..e9ec643c6 100644
--- a/src/core/tools/qstringlist.h
+++ b/src/core/tools/qstringlist.h
@@ -42,7 +42,6 @@
 #ifndef QSTRINGLIST_H
 #define QSTRINGLIST_H
 
-#include <QtCore/qalgorithms.h>
 #include <QtCore/qdatastream.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qregexp.h>
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 7b26e6d80..da3a03be9 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -76,9 +76,9 @@
 #include "qmacdefines_mac.h"
 #ifdef QT_MAC_USE_COCOA
 
-#import <private/qcocoaapplicationdelegate_mac_p.h>
-#import <private/qcocoamenuloader_mac_p.h>
-#import <private/qcocoaapplication_mac_p.h>
+#import <qcocoaapplicationdelegate_mac_p.h>
+#import <qcocoamenuloader_mac_p.h>
+#import <qcocoaapplication_mac_p.h>
 #include <qapplication_p.h>
 #include <qt_mac_p.h>
 #include <qt_cocoa_helpers_mac_p.h>
diff --git a/src/gui/kernel/qcocoapanel_mac.mm b/src/gui/kernel/qcocoapanel_mac.mm
index 7f6d31979..4aff7ec9e 100644
--- a/src/gui/kernel/qcocoapanel_mac.mm
+++ b/src/gui/kernel/qcocoapanel_mac.mm
@@ -39,18 +39,18 @@
 **
 ****************************************************************************/
 
-#import <private/qcocoapanel_mac_p.h>
+#import <qcocoapanel_mac_p.h>
 #ifdef QT_MAC_USE_COCOA
-#import <private/qt_cocoa_helpers_mac_p.h>
-#import <private/qcocoawindow_mac_p.h>
-#import <private/qcocoawindowdelegate_mac_p.h>
-#import <private/qcocoaview_mac_p.h>
-#import <private/qcocoawindowcustomthemeframe_mac_p.h>
-#import <private/qcocoaapplication_mac_p.h>
-#import <private/qmultitouch_mac_p.h>
-#import <private/qapplication_p.h>
-#import <private/qbackingstore_p.h>
-#import <private/qdnd_p.h>
+#import <qt_cocoa_helpers_mac_p.h>
+#import <qcocoawindow_mac_p.h>
+#import <qcocoawindowdelegate_mac_p.h>
+#import <qcocoaview_mac_p.h>
+#import <qcocoawindowcustomthemeframe_mac_p.h>
+#import <qcocoaapplication_mac_p.h>
+#import <qmultitouch_mac_p.h>
+#import <qapplication_p.h>
+#import <qbackingstore_p.h>
+#import <qdnd_p.h>
 
 #include <QtGui/QWidget>
 
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 2d5cfce5a..d57d45f7d 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <qconfig.h>
-#import <private/qcocoaview_mac_p.h>
+#import <qcocoaview_mac_p.h>
 #ifdef QT_MAC_USE_COCOA
 
 #include <qwidget_p.h>
diff --git a/src/gui/kernel/qcocoawindow_mac.mm b/src/gui/kernel/qcocoawindow_mac.mm
index 41e81ad84..02196b317 100644
--- a/src/gui/kernel/qcocoawindow_mac.mm
+++ b/src/gui/kernel/qcocoawindow_mac.mm
@@ -41,14 +41,14 @@
 
 #include "qmacdefines_mac.h"
 #ifdef QT_MAC_USE_COCOA
-#import <private/qcocoawindow_mac_p.h>
-#import <private/qcocoawindowdelegate_mac_p.h>
-#import <private/qcocoaview_mac_p.h>
-#import <private/qt_cocoa_helpers_mac_p.h>
-#import <private/qcocoawindowcustomthemeframe_mac_p.h>
-#import <private/qcocoaapplication_mac_p.h>
-#import <private/qdnd_p.h>
-#import <private/qmultitouch_mac_p.h>
+#import <qcocoawindow_mac_p.h>
+#import <qcocoawindowdelegate_mac_p.h>
+#import <qcocoaview_mac_p.h>
+#import <qt_cocoa_helpers_mac_p.h>
+#import <qcocoawindowcustomthemeframe_mac_p.h>
+#import <qcocoaapplication_mac_p.h>
+#import <qdnd_p.h>
+#import <qmultitouch_mac_p.h>
 
 #include <QtGui/QWidget>
 
diff --git a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm b/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
index 1ba493064..f52f47585 100644
--- a/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
+++ b/src/gui/kernel/qcocoawindowcustomthemeframe_mac.mm
@@ -43,8 +43,8 @@
 
 #ifdef QT_MAC_USE_COCOA
 
-#import "private/qcocoawindowcustomthemeframe_mac_p.h"
-#import "private/qcocoawindow_mac_p.h"
+#import "qcocoawindowcustomthemeframe_mac_p.h"
+#import "qcocoawindow_mac_p.h"
 #include "qt_cocoa_helpers_mac_p.h"
 #include "qwidget.h"
 
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac.mm b/src/gui/kernel/qcocoawindowdelegate_mac.mm
index af34669b6..d0fd5d7cd 100644
--- a/src/gui/kernel/qcocoawindowdelegate_mac.mm
+++ b/src/gui/kernel/qcocoawindowdelegate_mac.mm
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#import "private/qcocoawindowdelegate_mac_p.h"
+#import "qcocoawindowdelegate_mac_p.h"
 #ifdef QT_MAC_USE_COCOA
 #include <qwidget_p.h>
 #include <qapplication_p.h>
diff --git a/src/gui/util/qsystemtrayicon_p.h b/src/gui/util/qsystemtrayicon_p.h
index 71431ccd6..bec071d58 100644
--- a/src/gui/util/qsystemtrayicon_p.h
+++ b/src/gui/util/qsystemtrayicon_p.h
@@ -66,8 +66,6 @@
 QT_BEGIN_NAMESPACE
 
 class QSystemTrayIconSys;
-class QToolButton;
-class QLabel;
 
 class QSystemTrayIconPrivate : public QObjectPrivate
 {
diff --git a/src/gui/widgets/qcocoamenu_mac.mm b/src/gui/widgets/qcocoamenu_mac.mm
index b2e6bb44e..dcfb63d43 100644
--- a/src/gui/widgets/qcocoamenu_mac.mm
+++ b/src/gui/widgets/qcocoamenu_mac.mm
@@ -42,9 +42,9 @@
 #include "qmacdefines_mac.h"
 #include "qapplication.h"
 #ifdef QT_MAC_USE_COCOA
-#import <private/qcocoamenu_mac_p.h>
-#import <private/qcocoamenuloader_mac_p.h>
-#import <private/qcocoaapplication_mac_p.h>
+#import <qcocoamenu_mac_p.h>
+#import <qcocoamenuloader_mac_p.h>
+#import <qcocoaapplication_mac_p.h>
 #include <qt_cocoa_helpers_mac_p.h>
 #include <qapplication_p.h>
 #include <qaction_p.h>
diff --git a/src/gui/widgets/qcocoatoolbardelegate_mac.mm b/src/gui/widgets/qcocoatoolbardelegate_mac.mm
index 12b1940e8..2edd3c0ea 100644
--- a/src/gui/widgets/qcocoatoolbardelegate_mac.mm
+++ b/src/gui/widgets/qcocoatoolbardelegate_mac.mm
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#import <private/qcocoatoolbardelegate_mac_p.h>
+#import <qcocoatoolbardelegate_mac_p.h>
 #ifdef QT_MAC_USE_COCOA
 #include <qmainwindowlayout_p.h>
 #include <qt_mac_p.h>
diff --git a/src/gui/widgets/qmacnativewidget_mac.mm b/src/gui/widgets/qmacnativewidget_mac.mm
index 6807207c7..db6a910de 100644
--- a/src/gui/widgets/qmacnativewidget_mac.mm
+++ b/src/gui/widgets/qmacnativewidget_mac.mm
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #import <Cocoa/Cocoa.h>
-#import <private/qcocoaview_mac_p.h>
+#import <qcocoaview_mac_p.h>
 #include "qmacnativewidget_mac.h"
 #include <qwidget_p.h>
 
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm
index 9f9783973..ff0dae8a2 100644
--- a/src/gui/widgets/qmainwindowlayout_mac.mm
+++ b/src/gui/widgets/qmainwindowlayout_mac.mm
@@ -50,7 +50,7 @@
 #else
 #include <quuid.h>
 #include <qcocoatoolbardelegate_mac_p.h>
-#import  <private/qcocoawindowdelegate_mac_p.h>
+#import  <qcocoawindowdelegate_mac_p.h>
 #endif
 
 QT_BEGIN_NAMESPACE