3 files changed, 7 insertions, 6 deletions
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h
index b4731fdb1f..740b6b8163 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -151,6 +151,10 @@ protected:
     mutable QDBusArgumentPrivate *d;
 };
 
+QT_END_NAMESPACE
+Q_DECLARE_METATYPE(QDBusArgument)
+QT_BEGIN_NAMESPACE
+
 template<typename T> inline T qdbus_cast(const QDBusArgument &arg
 #ifndef Q_QDOC
 , T * = 0
@@ -396,8 +400,6 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantHash &map)
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QDBusArgument)
-
 QT_END_HEADER
 
 #endif // QT_NO_DBUS
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 971b93fc65..17c3c5b576 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -141,6 +141,7 @@ Q_DECLARE_METATYPE(QDateTime)
 Q_DECLARE_METATYPE(QDate)
 Q_DECLARE_METATYPE(QTime)
 Q_DECLARE_METATYPE(Qt::TimeSpec)
+Q_DECLARE_METATYPE(Qt::DateFormat)
 
 tst_QDateTime::tst_QDateTime()
 {
@@ -1626,7 +1627,5 @@ void tst_QDateTime::utcOffsetLessThan() const
     QVERIFY(!(dt2 < dt1));
 }
 
-Q_DECLARE_METATYPE(Qt::DateFormat)
-
 QTEST_APPLESS_MAIN(tst_QDateTime)
 #include "tst_qdatetime.moc"
diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 09d3051ca5..e83189ec6f 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -293,6 +293,8 @@ private:
     template<typename T> void detach() const;
 };
 
+Q_DECLARE_METATYPE(QVector<int>);
+
 template<typename T> struct SimpleValue
 {
     static T at(int index)
@@ -2026,8 +2028,6 @@ void tst_QVector::const_shared_null()
     QVERIFY(!v2.isDetached());
 }
 
-Q_DECLARE_METATYPE(QVector<int>);
-
 template<typename T>
 void tst_QVector::setSharable_data() const
 {