diff --git a/src/declarative/items/qsgpathview_p_p.h b/src/declarative/items/qsgpathview_p_p.h
index 520de429fe60f8dc93d00616f793c5e149ed3ce5..10549d97094819f9fb4d6a9df6728853f17ff96d 100644
--- a/src/declarative/items/qsgpathview_p_p.h
+++ b/src/declarative/items/qsgpathview_p_p.h
@@ -64,6 +64,7 @@
 
 #include <private/qdeclarativeanimation_p_p.h>
 #include <private/qdeclarativeguard_p.h>
+#include <private/qdeclarativetimeline_p_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 609057dd88392b9774e2cd5ec1aa945d20625830..531842a6953b7235a54dcc6ea8ecec269ea9ac98 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -45,10 +45,8 @@
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
 #include "qdeclarativeinfo.h"
-#include "qdeclarativecontext_p.h"
 #include "qdeclarativecompiler_p.h"
 #include "qdeclarativedata_p.h"
-#include "qdeclarativestringconverters_p.h"
 #include <private/qdeclarativedebugtrace_p.h>
 
 #include <QVariant>
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 2fe2aa014a9afd00bb6fad446d024bc1acfaa485..8c21d11037e824713b7d73dea4643ae9c5a757ef 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -42,7 +42,6 @@
 #include "qdeclarativeanimation_p.h"
 #include "qdeclarativeanimation_p_p.h"
 
-#include <private/qdeclarativebehavior_p.h>
 #include <private/qdeclarativestateoperations_p.h>
 #include <private/qdeclarativecontext_p.h>
 
diff --git a/src/declarative/util/qdeclarativeanimation_p.h b/src/declarative/util/qdeclarativeanimation_p.h
index ac2cb3c8e860efbf195de1e41e5116f14d3daf82..c84af5a53e498ba2ea56ef2998bf5ae9fc049921 100644
--- a/src/declarative/util/qdeclarativeanimation_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p.h
@@ -42,7 +42,6 @@
 #ifndef QDECLARATIVEANIMATION_H
 #define QDECLARATIVEANIMATION_H
 
-#include "qdeclarativetransition_p.h"
 #include "qdeclarativestate_p.h"
 #include <QtGui/qvector3d.h>
 
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index a14356d0c7bd3cbbc35d8935a61ac079d39bab5c..dfeb7678779f255fef6d2419320acd8f39ddcb34 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -56,7 +56,6 @@
 #include "qdeclarativeanimation_p.h"
 
 #include <private/qdeclarativenullablevalue_p_p.h>
-#include <private/qdeclarativetimeline_p_p.h>
 
 #include <qdeclarative.h>
 #include <qdeclarativecontext.h>
diff --git a/src/declarative/util/qdeclarativebehavior.cpp b/src/declarative/util/qdeclarativebehavior.cpp
index 3b0ec86ec2c133ce619170bb0b90b31cb30f68b3..8ff1a06c822cde63ca146b2a031ab7e4fbd18543 100644
--- a/src/declarative/util/qdeclarativebehavior.cpp
+++ b/src/declarative/util/qdeclarativebehavior.cpp
@@ -42,8 +42,6 @@
 #include "qdeclarativebehavior_p.h"
 
 #include "qdeclarativeanimation_p.h"
-#include "qdeclarativetransition_p.h"
-
 #include <qdeclarativecontext.h>
 #include <qdeclarativeinfo.h>
 #include <private/qdeclarativeproperty_p.h>
diff --git a/src/declarative/util/qdeclarativebehavior_p.h b/src/declarative/util/qdeclarativebehavior_p.h
index 233be2b232b5fa35cf49594b49d6367bb3804786..3918d34f541cbe47e4cc1e59ea95b5627305eedf 100644
--- a/src/declarative/util/qdeclarativebehavior_p.h
+++ b/src/declarative/util/qdeclarativebehavior_p.h
@@ -42,9 +42,8 @@
 #ifndef QDECLARATIVEBEHAVIOR_H
 #define QDECLARATIVEBEHAVIOR_H
 
-#include "qdeclarativestate_p.h"
+#include <private/qdeclarativeglobal_p.h>
 
-#include <qdeclarativepropertyvaluesource.h>
 #include <qdeclarativepropertyvalueinterceptor.h>
 #include <qdeclarative.h>
 #include <QtCore/QAbstractAnimation>
diff --git a/src/declarative/util/qdeclarativebind.cpp b/src/declarative/util/qdeclarativebind.cpp
index 5d62830cdd7961a5277689fa049825198a462106..20b2caa582f0dead1bc5a1bb4e21c19251e24a0e 100644
--- a/src/declarative/util/qdeclarativebind.cpp
+++ b/src/declarative/util/qdeclarativebind.cpp
@@ -53,8 +53,6 @@
 
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
-#include <QtDeclarative/qjsvalue.h>
-#include <QtDeclarative/qjsengine.h>
 
 #include <private/qobject_p.h>
 
diff --git a/src/declarative/util/qdeclarativeconnections_p.h b/src/declarative/util/qdeclarativeconnections_p.h
index af652fcabf0bb530c4310f1a3f0777250454c0c4..86e134168936ab5cb58367530531fe149e1cdc7d 100644
--- a/src/declarative/util/qdeclarativeconnections_p.h
+++ b/src/declarative/util/qdeclarativeconnections_p.h
@@ -43,7 +43,6 @@
 #define QDECLARATIVECONNECTIONS_H
 
 #include <qdeclarative.h>
-#include <qdeclarativescriptstring.h>
 #include <private/qdeclarativecustomparser_p.h>
 
 #include <QtCore/qobject.h>
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index fc559431c23e5f10ce7d8517a6a7db4b7e01fa36..818c1638cdfbec8edb85d3e589871c8a14b9165a 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -44,7 +44,6 @@
 #include "qdeclarativeopenmetaobject_p.h"
 #include <private/qdeclarativerewrite_p.h>
 #include <private/qdeclarativeengine_p.h>
-#include <private/qdeclarativecompiler_p.h>
 
 #include <qdeclarativeinfo.h>
 #include <private/qdeclarativecustomparser_p.h>
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index e5e245f71588eb1b498f7fab549156cdfd817180..2c039f93a4e1d99f0f3008e897a879185114638f 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -42,13 +42,9 @@
 #include "qdeclarativestate_p_p.h"
 #include "qdeclarativestate_p.h"
 
-#include "qdeclarativetransition_p.h"
 #include "qdeclarativestategroup_p.h"
 #include "qdeclarativestateoperations_p.h"
-#include "qdeclarativeanimation_p.h"
-#include "qdeclarativeanimation_p_p.h"
 
-#include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/declarative/util/qdeclarativestate_p_p.h b/src/declarative/util/qdeclarativestate_p_p.h
index 5ddd0d5e8a82fc1b64a9ee0b8782de77fb630fb1..a9c50f4aed6dbd56c6536db6bda4108357b5646c 100644
--- a/src/declarative/util/qdeclarativestate_p_p.h
+++ b/src/declarative/util/qdeclarativestate_p_p.h
@@ -55,7 +55,6 @@
 
 #include "qdeclarativestate_p.h"
 
-#include "qdeclarativeanimation_p_p.h"
 #include "qdeclarativetransitionmanager_p_p.h"
 
 #include <private/qdeclarativeproperty_p.h>
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index c29aaa723c11e656c3b456f1762e01b946c9844d..51e27e4bf006af8582a1bd9a35d342d2017871d3 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -42,12 +42,12 @@
 #include "qdeclarativestategroup_p.h"
 
 #include "qdeclarativetransition_p.h"
-#include "qdeclarativestate_p_p.h"
 
 #include <private/qdeclarativebinding_p.h>
 #include <private/qdeclarativeglobal_p.h>
 
 #include <QtCore/qstringbuilder.h>
+#include <QtCore/qstringlist.h>
 #include <QtCore/qdebug.h>
 
 #include <private/qobject_p.h>
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index ec79120e7a74d25ba11abac5bc081e9757790677..d8a536956869e795a20233f4275490bbd628297c 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -46,7 +46,6 @@
 #include <qdeclarativeexpression.h>
 #include <qdeclarativeinfo.h>
 #include <private/qdeclarativeguard_p.h>
-#include <private/qdeclarativenullablevalue_p_p.h>
 #include <private/qdeclarativecontext_p.h>
 #include <private/qdeclarativeproperty_p.h>
 #include <private/qdeclarativebinding_p.h>
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index b0f8cbd76bfb9367336352a13d2d11ef06645de3..916e599cc64c4b9cd9fb066a361ba2133feb988a 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -39,8 +39,9 @@
 **
 ****************************************************************************/
 
+#include "qdeclarativetransition_p.h"
+
 #include "qdeclarativestate_p.h"
-#include "qdeclarativestategroup_p.h"
 #include "qdeclarativestate_p_p.h"
 #include "qdeclarativestateoperations_p.h"
 #include "qdeclarativeanimation_p.h"
diff --git a/src/declarative/util/qdeclarativetransitionmanager.cpp b/src/declarative/util/qdeclarativetransitionmanager.cpp
index 57336f59fc5a7fac45f9ebe1d577612368d12b2d..2dd1da70ed3ec40b34c57fff917e481605f1a3a3 100644
--- a/src/declarative/util/qdeclarativetransitionmanager.cpp
+++ b/src/declarative/util/qdeclarativetransitionmanager.cpp
@@ -41,6 +41,7 @@
 
 #include "qdeclarativetransitionmanager_p_p.h"
 
+#include "qdeclarativetransition_p.h"
 #include "qdeclarativestate_p_p.h"
 #include "qdeclarativestate_p.h"
 
@@ -48,6 +49,8 @@
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativeproperty_p.h>
 
+#include <QtCore/qdebug.h>
+
 QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 76d832626d5c8b1391e4579c0dc8fc21185336e8..81aac51393449d071f51432dfe49614ac46be672 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -44,6 +44,7 @@
 #include <QtDeclarative/qsgview.h>
 #include <QtDeclarative/private/qsgrectangle_p.h>
 #include <QtDeclarative/private/qdeclarativeanimation_p.h>
+#include <QtDeclarative/private/qdeclarativetransition_p.h>
 #include <QtDeclarative/private/qsganimation_p.h>
 #include <QtDeclarative/private/qdeclarativepathinterpolator_p.h>
 #include <QtDeclarative/private/qsgitem_p.h>