6 files changed, 7 insertions, 14 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase_p.h b/src/sql/drivers/ibase/qsql_ibase_p.h
index 3a61f3394b..82a8c205dc 100644
--- a/src/sql/drivers/ibase/qsql_ibase_p.h
+++ b/src/sql/drivers/ibase/qsql_ibase_p.h
@@ -45,14 +45,13 @@
 // We mean it.
 //
 
-#include <QtSql/qsqlresult.h>
 #include <QtSql/qsqldriver.h>
 #include <ibase.h>
 
 QT_BEGIN_NAMESPACE
 
+class QSqlResult;
 class QIBaseDriverPrivate;
-class QIBaseDriver;
 
 class QIBaseDriver : public QSqlDriver
 {
diff --git a/src/sql/drivers/oci/qsql_oci_p.h b/src/sql/drivers/oci/qsql_oci_p.h
index 48da952d56..a37df202d4 100644
--- a/src/sql/drivers/oci/qsql_oci_p.h
+++ b/src/sql/drivers/oci/qsql_oci_p.h
@@ -45,7 +45,6 @@
 // We mean it.
 //
 
-#include <QtSql/qsqlresult.h>
 #include <QtSql/qsqldriver.h>
 
 #ifdef QT_PLUGIN
@@ -59,8 +58,7 @@ typedef struct OCISvcCtx OCISvcCtx;
 
 QT_BEGIN_NAMESPACE
 
-class QOCIDriver;
-class QOCICols;
+class QSqlResult;
 class QOCIDriverPrivate;
 
 class Q_EXPORT_SQLDRIVER_OCI QOCIDriver : public QSqlDriver
diff --git a/src/sql/drivers/sqlite/qsql_sqlite_p.h b/src/sql/drivers/sqlite/qsql_sqlite_p.h
index 23b598de98..06f7420572 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite_p.h
+++ b/src/sql/drivers/sqlite/qsql_sqlite_p.h
@@ -46,7 +46,6 @@
 //
 
 #include <QtSql/qsqldriver.h>
-#include <QtSql/qsqlresult.h>
 
 struct sqlite3;
 
@@ -58,8 +57,8 @@ struct sqlite3;
 
 QT_BEGIN_NAMESPACE
 
+class QSqlResult;
 class QSQLiteDriverPrivate;
-class QSQLiteDriver;
 
 class Q_EXPORT_SQLDRIVER_SQLITE QSQLiteDriver : public QSqlDriver
 {
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2_p.h b/src/sql/drivers/sqlite2/qsql_sqlite2_p.h
index 95766dacd0..662d042166 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2_p.h
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2_p.h
@@ -46,9 +46,6 @@
 //
 
 #include <QtSql/qsqldriver.h>
-#include <QtSql/qsqlresult.h>
-#include <QtSql/qsqlrecord.h>
-#include <QtSql/qsqlindex.h>
 
 #if defined (Q_OS_WIN32)
 # include <QtCore/qt_windows.h>
@@ -58,8 +55,8 @@ struct sqlite;
 
 QT_BEGIN_NAMESPACE
 
+class QSqlResult;
 class QSQLite2DriverPrivate;
-class QSQLite2Driver;
 
 class QSQLite2Driver : public QSqlDriver
 {
diff --git a/src/sql/drivers/tds/qsql_tds_p.h b/src/sql/drivers/tds/qsql_tds_p.h
index fae5dc2877..aa20e84919 100644
--- a/src/sql/drivers/tds/qsql_tds_p.h
+++ b/src/sql/drivers/tds/qsql_tds_p.h
@@ -45,7 +45,6 @@
 // We mean it.
 //
 
-#include <QtSql/qsqlresult.h>
 #include <QtSql/qsqldriver.h>
 
 #ifdef Q_OS_WIN32
@@ -71,8 +70,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QSqlResult;
 class QTDSDriverPrivate;
-class QTDSDriver;
 
 class Q_EXPORT_SQLDRIVER_TDS QTDSDriver : public QSqlDriver
 {
diff --git a/src/sql/kernel/qsqlresult_p.h b/src/sql/kernel/qsqlresult_p.h
index 1cd8b9bbcc..4fee77eecd 100644
--- a/src/sql/kernel/qsqlresult_p.h
+++ b/src/sql/kernel/qsqlresult_p.h
@@ -46,7 +46,6 @@
 //
 
 #include <QtCore/qpointer.h>
-#include <QtSql/qsqldriver.h>
 #include "qsqlerror.h"
 #include "qsqlresult.h"
 
@@ -60,6 +59,8 @@ struct QHolder {
     int holderPos;
 };
 
+class QSqlDriver;
+
 class Q_SQL_EXPORT QSqlResultPrivate
 {