2 files changed, 32 insertions, 33 deletions
diff --git a/src/sql/drivers/db2/qsql_db2.cpp b/src/sql/drivers/db2/qsql_db2.cpp
index dd49963d93..7282d3a655 100644
--- a/src/sql/drivers/db2/qsql_db2.cpp
+++ b/src/sql/drivers/db2/qsql_db2.cpp
@@ -32,7 +32,6 @@
 ****************************************************************************/
 
 #include "qsql_db2_p.h"
-#include <QtSql/private/qsqldriver_p.h>
 #include <qcoreapplication.h>
 #include <qdatetime.h>
 #include <qsqlfield.h>
@@ -43,6 +42,8 @@
 #include <qvarlengtharray.h>
 #include <qvector.h>
 #include <QDebug>
+#include <QtSql/private/qsqldriver_p.h>
+#include <QtSql/private/qsqlresult_p.h>
 
 #if defined(Q_CC_BOR)
 // DB2's sqlsystm.h (included through sqlcli1.h) defines the SQL_BIGINT_TYPE
@@ -72,6 +73,36 @@ public:
     QString user;
 };
 
+class QDB2ResultPrivate;
+
+class QDB2Result: public QSqlResult
+{
+public:
+    QDB2Result(const QDB2Driver *dr, const QDB2DriverPrivate *dp);
+    ~QDB2Result();
+    bool prepare(const QString &query);
+    bool exec();
+    QVariant handle() const;
+
+protected:
+    QVariant data(int field);
+    bool reset (const QString &query);
+    bool fetch(int i);
+    bool fetchNext();
+    bool fetchFirst();
+    bool fetchLast();
+    bool isNull(int i);
+    int size();
+    int numRowsAffected();
+    QSqlRecord record() const;
+    void virtual_hook(int id, void *data);
+    void detachFromResultSet();
+    bool nextResult();
+
+private:
+    QDB2ResultPrivate *d;
+};
+
 class QDB2ResultPrivate
 {
 public:
diff --git a/src/sql/drivers/db2/qsql_db2_p.h b/src/sql/drivers/db2/qsql_db2_p.h
index 7b5d751b89..f3f081f731 100644
--- a/src/sql/drivers/db2/qsql_db2_p.h
+++ b/src/sql/drivers/db2/qsql_db2_p.h
@@ -53,43 +53,11 @@
 #define Q_EXPORT_SQLDRIVER_DB2 Q_SQL_EXPORT
 #endif
 
-#include <QtSql/qsqlresult.h>
 #include <QtSql/qsqldriver.h>
 
 QT_BEGIN_NAMESPACE
 
-class QDB2Driver;
 class QDB2DriverPrivate;
-class QDB2ResultPrivate;
-class QSqlRecord;
-
-class QDB2Result : public QSqlResult
-{
-public:
-    QDB2Result(const QDB2Driver* dr, const QDB2DriverPrivate* dp);
-    ~QDB2Result();
-    bool prepare(const QString& query);
-    bool exec();
-    QVariant handle() const;
-
-protected:
-    QVariant data(int field);
-    bool reset (const QString& query);
-    bool fetch(int i);
-    bool fetchNext();
-    bool fetchFirst();
-    bool fetchLast();
-    bool isNull(int i);
-    int size();
-    int numRowsAffected();
-    QSqlRecord record() const;
-    void virtual_hook(int id, void *data);
-    void detachFromResultSet();
-    bool nextResult();
-
-private:
-    QDB2ResultPrivate* d;
-};
 
 class Q_EXPORT_SQLDRIVER_DB2 QDB2Driver : public QSqlDriver
 {