diff --git a/src/sql/kernel/qsqlcachedresult.cpp b/src/sql/kernel/qsqlcachedresult.cpp
index 2e453fe763d..477cf6da116 100644
--- a/src/sql/kernel/qsqlcachedresult.cpp
+++ b/src/sql/kernel/qsqlcachedresult.cpp
@@ -3,7 +3,6 @@
 
 #include "private/qsqlcachedresult_p.h"
 
-#include <qdatetime.h>
 #include <qvariant.h>
 #include <QtSql/private/qsqldriver_p.h>
 
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index 010c02eafa3..ee8ebcb8c73 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -6,16 +6,13 @@
 #include "qdebug.h"
 #include "qcoreapplication.h"
 #include "qreadwritelock.h"
-#include "qsqlresult.h"
 #include "qsqldriver.h"
 #include "qsqldriverplugin.h"
 #include "qsqlindex.h"
 #include "private/qfactoryloader_p.h"
 #include "private/qsqlnulldriver_p.h"
-#include "qmutex.h"
 #include "qhash.h"
 #include "qthread.h"
-#include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp
index 7c8c329d64a..6102aece24e 100644
--- a/src/sql/kernel/qsqldriver.cpp
+++ b/src/sql/kernel/qsqldriver.cpp
@@ -7,7 +7,6 @@
 #include "qsqlerror.h"
 #include "qsqlfield.h"
 #include "qsqlindex.h"
-#include "private/qobject_p.h"
 #include "private/qsqldriver_p.h"
 
 #include <limits.h>
diff --git a/src/sql/kernel/qsqlindex.cpp b/src/sql/kernel/qsqlindex.cpp
index 06aab348479..25b032f3369 100644
--- a/src/sql/kernel/qsqlindex.cpp
+++ b/src/sql/kernel/qsqlindex.cpp
@@ -4,7 +4,6 @@
 #include "qsqlindex.h"
 
 #include "qsqlfield.h"
-#include "qstringlist.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index 106089f75d4..d729dbda6b7 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -7,14 +7,16 @@
 
 #include "qatomic.h"
 #include "qdebug.h"
-#include "qelapsedtimer.h"
-#include "qmap.h"
 #include "qsqlrecord.h"
 #include "qsqlresult.h"
 #include "qsqldriver.h"
 #include "qsqldatabase.h"
 #include "private/qsqlnulldriver_p.h"
 
+#ifdef QT_DEBUG_SQL
+#include "qelapsedtimer.h"
+#endif
+
 QT_BEGIN_NAMESPACE
 
 class QSqlQueryPrivate
diff --git a/src/sql/kernel/qsqlrecord.cpp b/src/sql/kernel/qsqlrecord.cpp
index bd2be0fc7a6..c9f26e27a14 100644
--- a/src/sql/kernel/qsqlrecord.cpp
+++ b/src/sql/kernel/qsqlrecord.cpp
@@ -8,7 +8,6 @@
 #include "qlist.h"
 #include "qsqlfield.h"
 #include "qstring.h"
-#include "qstringlist.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index 642aea54615..d283e1212e6 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -3,9 +3,7 @@
 
 #include "qsqlresult.h"
 
-#include "qhash.h"
 #include "qlist.h"
-#include "qpointer.h"
 #include "qsqldriver.h"
 #include "qsqlerror.h"
 #include "qsqlfield.h"
@@ -15,7 +13,6 @@
 #include "qvariant.h"
 #include "qdatetime.h"
 #include "private/qsqldriver_p.h"
-#include <QDebug>
 
 QT_BEGIN_NAMESPACE