Don't include mocs inside namespaces

See commit 5b99f3a3 in qtbase dev.

Task-number: QTBUG-71300
Change-Id: I38b281f8990baa9b8ea9969e52b8a7b80b5e7da9
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>

66 files changed, 128 insertions, 133 deletions

diff --git a/src/contacts/qcontactabstractrequest.cpp b/src/contacts/qcontactabstractrequest.cpp
index 4ee718f82..53649f2c8 100644
--- a/src/contacts/qcontactabstractrequest.cpp
+++ b/src/contacts/qcontactabstractrequest.cpp
@@ -354,6 +354,6 @@ QDebug operator<<(QDebug dbg, const QContactAbstractRequest& request)
 }
 #endif
 
-#include "moc_qcontactabstractrequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactabstractrequest.cpp"
diff --git a/src/contacts/qcontactaction.cpp b/src/contacts/qcontactaction.cpp
index 3ae962b72..4e93ab055 100644
--- a/src/contacts/qcontactaction.cpp
+++ b/src/contacts/qcontactaction.cpp
@@ -287,6 +287,6 @@ QContactAction* QContactAction::action(const QContactActionDescriptor& descripto
     return qcam->action(descriptor);
 }
 
-#include "moc_qcontactaction.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactaction.cpp"
diff --git a/src/contacts/qcontactactionfactory.cpp b/src/contacts/qcontactactionfactory.cpp
index 782d2cb96..c7b7df153 100644
--- a/src/contacts/qcontactactionfactory.cpp
+++ b/src/contacts/qcontactactionfactory.cpp
@@ -136,6 +136,6 @@ QContactActionDescriptor QContactActionFactory::createDescriptor(const QString&
     return retn;
 }
 
-#include "moc_qcontactactionfactory.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactactionfactory.cpp"
diff --git a/src/contacts/qcontactactionmanager_p.cpp b/src/contacts/qcontactactionmanager_p.cpp
index 10a576ab7..88b110d29 100644
--- a/src/contacts/qcontactactionmanager_p.cpp
+++ b/src/contacts/qcontactactionmanager_p.cpp
@@ -125,6 +125,6 @@ QContactAction* QContactActionManager::action(const QContactActionDescriptor& de
     return 0;
 }
 
-#include "moc_qcontactactionmanager_p.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactactionmanager_p.cpp"
diff --git a/src/contacts/qcontactmanager.cpp b/src/contacts/qcontactmanager.cpp
index 813053f4f..5d7b4347e 100644
--- a/src/contacts/qcontactmanager.cpp
+++ b/src/contacts/qcontactmanager.cpp
@@ -955,6 +955,6 @@ void QContactManager::disconnectNotify(const QMetaMethod &signal)
     }
 }
 
-#include "moc_qcontactmanager.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactmanager.cpp"
diff --git a/src/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp
index bef764cc0..ebc96a89e 100644
--- a/src/contacts/qcontactmanagerengine.cpp
+++ b/src/contacts/qcontactmanagerengine.cpp
@@ -2481,6 +2481,6 @@ void QContactManagerEngine::updateContactFetchByIdRequest(QContactFetchByIdReque
 #endif
 }
 
-#include "moc_qcontactmanagerengine.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactmanagerengine.cpp"
diff --git a/src/contacts/qcontactmanagerenginefactory.cpp b/src/contacts/qcontactmanagerenginefactory.cpp
index 281174fce..b0538faff 100644
--- a/src/contacts/qcontactmanagerenginefactory.cpp
+++ b/src/contacts/qcontactmanagerenginefactory.cpp
@@ -110,6 +110,6 @@ QList<int> QContactManagerEngineFactory::supportedImplementationVersions() const
     return QList<int>();
 }
 
-#include "moc_qcontactmanagerenginefactory.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactmanagerenginefactory.cpp"
diff --git a/src/contacts/qcontactobserver.cpp b/src/contacts/qcontactobserver.cpp
index fa1f10f27..d3ddec013 100644
--- a/src/contacts/qcontactobserver.cpp
+++ b/src/contacts/qcontactobserver.cpp
@@ -110,6 +110,6 @@ QContactId QContactObserver::contactId() const {
   This signal is emitted when the observed contact is removed from the manager.
  */
 
-#include "moc_qcontactobserver.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactobserver.cpp"
diff --git a/src/contacts/requests/qcontactcollectionfetchrequest.cpp b/src/contacts/requests/qcontactcollectionfetchrequest.cpp
index fce86e5a2..ba755bd4c 100644
--- a/src/contacts/requests/qcontactcollectionfetchrequest.cpp
+++ b/src/contacts/requests/qcontactcollectionfetchrequest.cpp
@@ -79,6 +79,6 @@ QList<QContactCollection> QContactCollectionFetchRequest::collections() const
     return d->m_collections;
 }
 
-#include "moc_qcontactcollectionfetchrequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactcollectionfetchrequest.cpp"
diff --git a/src/contacts/requests/qcontactcollectionremoverequest.cpp b/src/contacts/requests/qcontactcollectionremoverequest.cpp
index 2486cec14..93dca21ab 100644
--- a/src/contacts/requests/qcontactcollectionremoverequest.cpp
+++ b/src/contacts/requests/qcontactcollectionremoverequest.cpp
@@ -108,6 +108,6 @@ QMap<int, QContactManager::Error> QContactCollectionRemoveRequest::errorMap() co
     return d->m_errors;
 }
 
-#include "moc_qcontactcollectionremoverequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactcollectionremoverequest.cpp"
diff --git a/src/contacts/requests/qcontactcollectionsaverequest.cpp b/src/contacts/requests/qcontactcollectionsaverequest.cpp
index bc4856c70..4e312e4d4 100644
--- a/src/contacts/requests/qcontactcollectionsaverequest.cpp
+++ b/src/contacts/requests/qcontactcollectionsaverequest.cpp
@@ -109,6 +109,6 @@ QMap<int, QContactManager::Error> QContactCollectionSaveRequest::errorMap() cons
     return d->m_errors;
 }
 
-#include "moc_qcontactcollectionsaverequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactcollectionsaverequest.cpp"
diff --git a/src/contacts/requests/qcontactfetchbyidrequest.cpp b/src/contacts/requests/qcontactfetchbyidrequest.cpp
index c981821a3..337685791 100644
--- a/src/contacts/requests/qcontactfetchbyidrequest.cpp
+++ b/src/contacts/requests/qcontactfetchbyidrequest.cpp
@@ -148,6 +148,6 @@ QMap<int, QContactManager::Error> QContactFetchByIdRequest::errorMap() const
     return d->m_errors;
 }
 
-#include "moc_qcontactfetchbyidrequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactfetchbyidrequest.cpp"
diff --git a/src/contacts/requests/qcontactfetchrequest.cpp b/src/contacts/requests/qcontactfetchrequest.cpp
index b17a7a7d1..e09d22e80 100644
--- a/src/contacts/requests/qcontactfetchrequest.cpp
+++ b/src/contacts/requests/qcontactfetchrequest.cpp
@@ -149,6 +149,6 @@ QList<QContact> QContactFetchRequest::contacts() const
     return d->m_contacts;
 }
 
-#include "moc_qcontactfetchrequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactfetchrequest.cpp"
diff --git a/src/contacts/requests/qcontactidfetchrequest.cpp b/src/contacts/requests/qcontactidfetchrequest.cpp
index cbccf74db..2bb27d33f 100644
--- a/src/contacts/requests/qcontactidfetchrequest.cpp
+++ b/src/contacts/requests/qcontactidfetchrequest.cpp
@@ -119,6 +119,6 @@ QList<QContactId> QContactIdFetchRequest::ids() const
     return d->m_ids;
 }
 
-#include "moc_qcontactidfetchrequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactidfetchrequest.cpp"
diff --git a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
index 64137e21f..18e0b2340 100644
--- a/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
@@ -144,6 +144,6 @@ QList<QContactRelationship> QContactRelationshipFetchRequest::relationships() co
     return d->m_relationships;
 }
 
-#include "moc_qcontactrelationshipfetchrequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactrelationshipfetchrequest.cpp"
diff --git a/src/contacts/requests/qcontactrelationshipremoverequest.cpp b/src/contacts/requests/qcontactrelationshipremoverequest.cpp
index cd930baf4..9e78b13a9 100644
--- a/src/contacts/requests/qcontactrelationshipremoverequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipremoverequest.cpp
@@ -117,6 +117,6 @@ QMap<int, QContactManager::Error> QContactRelationshipRemoveRequest::errorMap()
     return d->m_errors;
 }
 
-#include "moc_qcontactrelationshipremoverequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactrelationshipremoverequest.cpp"
diff --git a/src/contacts/requests/qcontactrelationshipsaverequest.cpp b/src/contacts/requests/qcontactrelationshipsaverequest.cpp
index 2f30f533b..4a2618a61 100644
--- a/src/contacts/requests/qcontactrelationshipsaverequest.cpp
+++ b/src/contacts/requests/qcontactrelationshipsaverequest.cpp
@@ -116,6 +116,6 @@ QMap<int, QContactManager::Error> QContactRelationshipSaveRequest::errorMap() co
     return d->m_errors;
 }
 
-#include "moc_qcontactrelationshipsaverequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactrelationshipsaverequest.cpp"
diff --git a/src/contacts/requests/qcontactremoverequest.cpp b/src/contacts/requests/qcontactremoverequest.cpp
index 558e053cc..9171da7b3 100644
--- a/src/contacts/requests/qcontactremoverequest.cpp
+++ b/src/contacts/requests/qcontactremoverequest.cpp
@@ -114,6 +114,6 @@ QMap<int, QContactManager::Error> QContactRemoveRequest::errorMap() const
     return d->m_errors;
 }
 
-#include "moc_qcontactremoverequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactremoverequest.cpp"
diff --git a/src/contacts/requests/qcontactsaverequest.cpp b/src/contacts/requests/qcontactsaverequest.cpp
index 9989ff401..36d224c03 100644
--- a/src/contacts/requests/qcontactsaverequest.cpp
+++ b/src/contacts/requests/qcontactsaverequest.cpp
@@ -158,6 +158,6 @@ QList<QContactDetail::DetailType> QContactSaveRequest::typeMask() const
     return d->m_typeMask;
 }
 
-#include "moc_qcontactsaverequest.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactsaverequest.cpp"
diff --git a/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp b/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp
index a30cc8520..c85ebd1d6 100644
--- a/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp
+++ b/src/imports/contacts/details/qdeclarativecontactmoc_p.cpp
@@ -39,8 +39,6 @@
 
 #include "qdeclarativecontactdetails_p.h"
 
-QT_BEGIN_NAMESPACE
-
 #include "moc_qdeclarativecontactaddress_p.cpp"
 #include "moc_qdeclarativecontactanniversary_p.cpp"
 #include "moc_qdeclarativecontactavatar_p.cpp"
@@ -69,5 +67,3 @@ QT_BEGIN_NAMESPACE
 #include "moc_qdeclarativecontacttimestamp_p.cpp"
 #include "moc_qdeclarativecontacturl_p.cpp"
 #include "moc_qdeclarativecontactversion_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp b/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp
index ff0986b23..ef7bb462f 100644
--- a/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp
+++ b/src/imports/contacts/filters/qdeclarativecontactfiltermoc.cpp
@@ -39,8 +39,6 @@
 
 #include "qdeclarativecontactfilters_p.h"
 
-QT_BEGIN_NAMESPACE
-
 #include "moc_qdeclarativecontactactionfilter_p.cpp"
 #include "moc_qdeclarativecontactchangelogfilter_p.cpp"
 #include "moc_qdeclarativecontactcollectionfilter_p.cpp"
@@ -51,5 +49,3 @@ QT_BEGIN_NAMESPACE
 #include "moc_qdeclarativecontactidfilter_p.cpp"
 #include "moc_qdeclarativecontactrelationshipfilter_p.cpp"
 #include "moc_qdeclarativecontactunionfilter_p.cpp"
-
-QT_END_NAMESPACE
diff --git a/src/imports/contacts/plugin.cpp b/src/imports/contacts/plugin.cpp
index 450f8117c..61cbab946 100644
--- a/src/imports/contacts/plugin.cpp
+++ b/src/imports/contacts/plugin.cpp
@@ -135,6 +135,6 @@ public:
     }
 };
 
-#include "plugin.moc"
-
 QT_END_NAMESPACE
+
+#include "plugin.moc"
diff --git a/src/imports/contacts/qdeclarativecontact.cpp b/src/imports/contacts/qdeclarativecontact.cpp
index 26cc2eb74..6968c3885 100644
--- a/src/imports/contacts/qdeclarativecontact.cpp
+++ b/src/imports/contacts/qdeclarativecontact.cpp
@@ -904,6 +904,6 @@ int QDeclarativeContact::_q_detail_count(QQmlListProperty<QDeclarativeContactDet
         return 0;
 }
 
-#include "moc_qdeclarativecontact_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontact_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactcollection.cpp b/src/imports/contacts/qdeclarativecontactcollection.cpp
index 20ec3a24d..96820c4a9 100644
--- a/src/imports/contacts/qdeclarativecontactcollection.cpp
+++ b/src/imports/contacts/qdeclarativecontactcollection.cpp
@@ -230,6 +230,6 @@ void QDeclarativeContactCollection::setCollection(const QContactCollection &coll
     d = collection;
 }
 
-#include "moc_qdeclarativecontactcollection_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactcollection_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactdetail.cpp b/src/imports/contacts/qdeclarativecontactdetail.cpp
index 378a9599a..c55223778 100644
--- a/src/imports/contacts/qdeclarativecontactdetail.cpp
+++ b/src/imports/contacts/qdeclarativecontactdetail.cpp
@@ -1305,6 +1305,6 @@ void QDeclarativeContactExtendedDetail::setData(const QVariant &newData)
   \endlist
 */
 
-#include "moc_qdeclarativecontactdetail_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactdetail_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactfetchhint.cpp b/src/imports/contacts/qdeclarativecontactfetchhint.cpp
index 0bc643322..6da4ee967 100644
--- a/src/imports/contacts/qdeclarativecontactfetchhint.cpp
+++ b/src/imports/contacts/qdeclarativecontactfetchhint.cpp
@@ -193,6 +193,6 @@ void QDeclarativeContactFetchHint::setFetchHint(const QContactFetchHint& fetchHi
     emit fetchHintChanged();
 }
 
-#include "moc_qdeclarativecontactfetchhint_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactfetchhint_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactfilter.cpp b/src/imports/contacts/qdeclarativecontactfilter.cpp
index 205616f89..dc8006fd0 100644
--- a/src/imports/contacts/qdeclarativecontactfilter.cpp
+++ b/src/imports/contacts/qdeclarativecontactfilter.cpp
@@ -417,6 +417,6 @@ void QDeclarativeContactCompoundFilter::filters_clear(QQmlListProperty<QDeclarat
     }
 }
 
-#include "moc_qdeclarativecontactfilter_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactfilter_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactmodel.cpp b/src/imports/contacts/qdeclarativecontactmodel.cpp
index 4ef1e5efa..00d16e78a 100644
--- a/src/imports/contacts/qdeclarativecontactmodel.cpp
+++ b/src/imports/contacts/qdeclarativecontactmodel.cpp
@@ -1576,6 +1576,6 @@ int QDeclarativeContactModel::contactIndex(const QDeclarativeContact* contact)
     return d->m_contacts.size();
 }
 
-#include "moc_qdeclarativecontactmodel_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactmodel_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactrelationship.cpp b/src/imports/contacts/qdeclarativecontactrelationship.cpp
index c64a9bd52..19660a6b6 100644
--- a/src/imports/contacts/qdeclarativecontactrelationship.cpp
+++ b/src/imports/contacts/qdeclarativecontactrelationship.cpp
@@ -167,6 +167,6 @@ void QDeclarativeContactRelationship::setRelationship(const QContactRelationship
     emit valueChanged();
 }
 
-#include "moc_qdeclarativecontactrelationship_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactrelationship_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp
index afcf38f16..ff4e5a776 100644
--- a/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp
+++ b/src/imports/contacts/qdeclarativecontactrelationshipmodel.cpp
@@ -424,6 +424,6 @@ void QDeclarativeContactRelationshipModel::relationshipsRemoved()
     }
 }
 
-#include "moc_qdeclarativecontactrelationshipmodel_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactrelationshipmodel_p.cpp"
diff --git a/src/imports/contacts/qdeclarativecontactsortorder.cpp b/src/imports/contacts/qdeclarativecontactsortorder.cpp
index a85c936e5..974d6f2da 100644
--- a/src/imports/contacts/qdeclarativecontactsortorder.cpp
+++ b/src/imports/contacts/qdeclarativecontactsortorder.cpp
@@ -172,6 +172,6 @@ void QDeclarativeContactSortOrder::setSortOrder(const QContactSortOrder& sortOrd
     emit sortOrderChanged();
 }
 
-#include "moc_qdeclarativecontactsortorder_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativecontactsortorder_p.cpp"
diff --git a/src/imports/organizer/plugin.cpp b/src/imports/organizer/plugin.cpp
index bfc339271..669411566 100644
--- a/src/imports/organizer/plugin.cpp
+++ b/src/imports/organizer/plugin.cpp
@@ -127,6 +127,6 @@ public:
     }
 };
 
-#include "plugin.moc"
-
 QT_END_NAMESPACE
+
+#include "plugin.moc"
diff --git a/src/imports/organizer/qdeclarativeorganizercollection.cpp b/src/imports/organizer/qdeclarativeorganizercollection.cpp
index 6203e4198..4ffea9b8b 100644
--- a/src/imports/organizer/qdeclarativeorganizercollection.cpp
+++ b/src/imports/organizer/qdeclarativeorganizercollection.cpp
@@ -230,6 +230,6 @@ void QDeclarativeOrganizerCollection::setCollection(const QOrganizerCollection &
     d = collection;
 }
 
-#include "moc_qdeclarativeorganizercollection_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizercollection_p.cpp"
diff --git a/src/imports/organizer/qdeclarativeorganizeritem.cpp b/src/imports/organizer/qdeclarativeorganizeritem.cpp
index f8d5421c2..9afb79273 100644
--- a/src/imports/organizer/qdeclarativeorganizeritem.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritem.cpp
@@ -1973,6 +1973,6 @@ QString QDeclarativeOrganizerTodoOccurrence::parentId() const
     return QString();
 }
 
-#include "moc_qdeclarativeorganizeritem_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizeritem_p.cpp"
diff --git a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
index 8cabad68b..f1c42ca7f 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemdetail.cpp
@@ -2489,6 +2489,6 @@ QDeclarativeOrganizerItemDetail *QDeclarativeOrganizerItemDetailFactory::createI
     return itemDetail;
 }
 
-#include "moc_qdeclarativeorganizeritemdetail_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizeritemdetail_p.cpp"
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp b/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp
index d1ba1d10c..0824a1b6e 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemfetchhint.cpp
@@ -143,6 +143,6 @@ void QDeclarativeOrganizerItemFetchHint::setFetchHint(const QOrganizerItemFetchH
     emit fetchHintChanged();
 }
 
-#include "moc_qdeclarativeorganizeritemfetchhint_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizeritemfetchhint_p.cpp"
diff --git a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
index 382ac9890..56a25cf5b 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemfilter.cpp
@@ -835,6 +835,6 @@ QOrganizerItemFilter QDeclarativeOrganizerItemIdFilter::filter() const
     return f;
 }
 
-#include "moc_qdeclarativeorganizeritemfilter_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizeritemfilter_p.cpp"
diff --git a/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp b/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp
index e58c884d4..9d4783c1a 100644
--- a/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp
+++ b/src/imports/organizer/qdeclarativeorganizeritemsortorder.cpp
@@ -177,6 +177,6 @@ QOrganizerItemSortOrder QDeclarativeOrganizerItemSortOrder::sortOrder()
     return d;
 }
 
-#include "moc_qdeclarativeorganizeritemsortorder_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizeritemsortorder_p.cpp"
diff --git a/src/imports/organizer/qdeclarativeorganizermodel.cpp b/src/imports/organizer/qdeclarativeorganizermodel.cpp
index eaeef1cef..98889f568 100644
--- a/src/imports/organizer/qdeclarativeorganizermodel.cpp
+++ b/src/imports/organizer/qdeclarativeorganizermodel.cpp
@@ -1892,6 +1892,6 @@ QDeclarativeOrganizerCollection* QDeclarativeOrganizerModel::collection_at(QQmlL
     return collection;
 }
 
-#include "moc_qdeclarativeorganizermodel_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizermodel_p.cpp"
diff --git a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
index b03165b6c..8216d18c5 100644
--- a/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
+++ b/src/imports/organizer/qdeclarativeorganizerrecurrencerule.cpp
@@ -363,6 +363,6 @@ void QDeclarativeOrganizerRecurrenceRule::setRule(const QOrganizerRecurrenceRule
     m_rule = rule;
 }
 
-#include "moc_qdeclarativeorganizerrecurrencerule_p.cpp"
-
 QT_END_NAMESPACE
+
+#include "moc_qdeclarativeorganizerrecurrencerule_p.cpp"
diff --git a/src/organizer/qorganizerabstractrequest.cpp b/src/organizer/qorganizerabstractrequest.cpp
index d8139375c..a8f6f97aa 100644
--- a/src/organizer/qorganizerabstractrequest.cpp
+++ b/src/organizer/qorganizerabstractrequest.cpp
@@ -312,6 +312,6 @@ QDebug operator<<(QDebug dbg, const QOrganizerAbstractRequest &request)
 }
 #endif
 
-#include "moc_qorganizerabstractrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizerabstractrequest.cpp"
diff --git a/src/organizer/qorganizeritemobserver.cpp b/src/organizer/qorganizeritemobserver.cpp
index 1ff919d30..add82d626 100644
--- a/src/organizer/qorganizeritemobserver.cpp
+++ b/src/organizer/qorganizeritemobserver.cpp
@@ -108,6 +108,6 @@ QOrganizerItemId QOrganizerItemObserver::itemId() const
     This signal is emitted when the observed item is removed from the manager.
  */
 
-#include "moc_qorganizeritemobserver.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemobserver.cpp"
diff --git a/src/organizer/qorganizermanager.cpp b/src/organizer/qorganizermanager.cpp
index f90814286..8176b05ad 100644
--- a/src/organizer/qorganizermanager.cpp
+++ b/src/organizer/qorganizermanager.cpp
@@ -783,6 +783,6 @@ QList<QOrganizerItemId> QOrganizerManager::extractIds(const QList<QOrganizerItem
     return ids;
 }
 
-#include "moc_qorganizermanager.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizermanager.cpp"
diff --git a/src/organizer/qorganizermanagerengine.cpp b/src/organizer/qorganizermanagerengine.cpp
index 338eb5d70..1adaafed8 100644
--- a/src/organizer/qorganizermanagerengine.cpp
+++ b/src/organizer/qorganizermanagerengine.cpp
@@ -2179,6 +2179,6 @@ void QOrganizerManagerEngine::updateCollectionSaveRequest(QOrganizerCollectionSa
 #endif
 }
 
-#include "moc_qorganizermanagerengine.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizermanagerengine.cpp"
diff --git a/src/organizer/qorganizermanagerenginefactory.cpp b/src/organizer/qorganizermanagerenginefactory.cpp
index f5f35da0f..4dd762a7b 100644
--- a/src/organizer/qorganizermanagerenginefactory.cpp
+++ b/src/organizer/qorganizermanagerenginefactory.cpp
@@ -93,6 +93,6 @@ QStringList QOrganizerManagerEngineFactory::keys() const
     return QStringList() << managerName();
 }
 
-#include "moc_qorganizermanagerenginefactory.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizermanagerenginefactory.cpp"
diff --git a/src/organizer/requests/qorganizercollectionfetchrequest.cpp b/src/organizer/requests/qorganizercollectionfetchrequest.cpp
index e6a185f2a..22bb888d1 100644
--- a/src/organizer/requests/qorganizercollectionfetchrequest.cpp
+++ b/src/organizer/requests/qorganizercollectionfetchrequest.cpp
@@ -78,6 +78,6 @@ QList<QOrganizerCollection> QOrganizerCollectionFetchRequest::collections() cons
     return d->m_collections;
 }
 
-#include "moc_qorganizercollectionfetchrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizercollectionfetchrequest.cpp"
diff --git a/src/organizer/requests/qorganizercollectionremoverequest.cpp b/src/organizer/requests/qorganizercollectionremoverequest.cpp
index e13dafe78..880e61450 100644
--- a/src/organizer/requests/qorganizercollectionremoverequest.cpp
+++ b/src/organizer/requests/qorganizercollectionremoverequest.cpp
@@ -107,6 +107,6 @@ QMap<int, QOrganizerManager::Error> QOrganizerCollectionRemoveRequest::errorMap(
     return d->m_errors;
 }
 
-#include "moc_qorganizercollectionremoverequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizercollectionremoverequest.cpp"
diff --git a/src/organizer/requests/qorganizercollectionsaverequest.cpp b/src/organizer/requests/qorganizercollectionsaverequest.cpp
index c43c1fd81..5007a6ea2 100644
--- a/src/organizer/requests/qorganizercollectionsaverequest.cpp
+++ b/src/organizer/requests/qorganizercollectionsaverequest.cpp
@@ -108,6 +108,6 @@ QMap<int, QOrganizerManager::Error> QOrganizerCollectionSaveRequest::errorMap()
     return d->m_errors;
 }
 
-#include "moc_qorganizercollectionsaverequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizercollectionsaverequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp b/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp
index 182156492..7699c08f8 100644
--- a/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp
+++ b/src/organizer/requests/qorganizeritemfetchbyidrequest.cpp
@@ -138,6 +138,6 @@ QMap<int, QOrganizerManager::Error> QOrganizerItemFetchByIdRequest::errorMap() c
     return d->m_errors;
 }
 
-#include "moc_qorganizeritemfetchbyidrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemfetchbyidrequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp b/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp
index 598a78b04..20b02db49 100644
--- a/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp
+++ b/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp
@@ -193,6 +193,6 @@ QList<QOrganizerItem> QOrganizerItemFetchForExportRequest::items() const
     return d->m_organizeritems;
 }
 
-#include "moc_qorganizeritemfetchforexportrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemfetchforexportrequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemfetchrequest.cpp b/src/organizer/requests/qorganizeritemfetchrequest.cpp
index 1b5204e61..5da2efeb1 100644
--- a/src/organizer/requests/qorganizeritemfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemfetchrequest.cpp
@@ -212,6 +212,6 @@ QList<QOrganizerItem> QOrganizerItemFetchRequest::items() const
     return d->m_organizeritems;
 }
 
-#include "moc_qorganizeritemfetchrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemfetchrequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemidfetchrequest.cpp b/src/organizer/requests/qorganizeritemidfetchrequest.cpp
index f41547b3b..090596ac3 100644
--- a/src/organizer/requests/qorganizeritemidfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemidfetchrequest.cpp
@@ -162,6 +162,6 @@ QList<QOrganizerItemId> QOrganizerItemIdFetchRequest::itemIds() const
     return d->m_ids;
 }
 
-#include "moc_qorganizeritemidfetchrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemidfetchrequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp b/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp
index 9c50d564f..073b431d1 100644
--- a/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp
@@ -195,6 +195,6 @@ QOrganizerItemFetchHint QOrganizerItemOccurrenceFetchRequest::fetchHint() const
     return d->m_fetchHint;
 }
 
-#include "moc_qorganizeritemoccurrencefetchrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemoccurrencefetchrequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemremovebyidrequest.cpp b/src/organizer/requests/qorganizeritemremovebyidrequest.cpp
index d708796e9..977d7f8ea 100644
--- a/src/organizer/requests/qorganizeritemremovebyidrequest.cpp
+++ b/src/organizer/requests/qorganizeritemremovebyidrequest.cpp
@@ -116,6 +116,6 @@ QMap<int, QOrganizerManager::Error> QOrganizerItemRemoveByIdRequest::errorMap()
     return d->m_errors;
 }
 
-#include "moc_qorganizeritemremovebyidrequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemremovebyidrequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemremoverequest.cpp b/src/organizer/requests/qorganizeritemremoverequest.cpp
index 68a691e9b..52be7684e 100644
--- a/src/organizer/requests/qorganizeritemremoverequest.cpp
+++ b/src/organizer/requests/qorganizeritemremoverequest.cpp
@@ -113,6 +113,6 @@ QMap<int, QOrganizerManager::Error> QOrganizerItemRemoveRequest::errorMap() cons
     return d->m_errors;
 }
 
-#include "moc_qorganizeritemremoverequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemremoverequest.cpp"
diff --git a/src/organizer/requests/qorganizeritemsaverequest.cpp b/src/organizer/requests/qorganizeritemsaverequest.cpp
index ba1f9f69d..0551541c6 100644
--- a/src/organizer/requests/qorganizeritemsaverequest.cpp
+++ b/src/organizer/requests/qorganizeritemsaverequest.cpp
@@ -153,6 +153,6 @@ QList<QOrganizerItemDetail::DetailType> QOrganizerItemSaveRequest::detailMask()
     return d->m_detailMask;
 }
 
-#include "moc_qorganizeritemsaverequest.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemsaverequest.cpp"
diff --git a/src/plugins/contacts/memory/qcontactmemorybackend.cpp b/src/plugins/contacts/memory/qcontactmemorybackend.cpp
index 23c852fb1..5cba6762e 100644
--- a/src/plugins/contacts/memory/qcontactmemorybackend.cpp
+++ b/src/plugins/contacts/memory/qcontactmemorybackend.cpp
@@ -1099,6 +1099,6 @@ bool QContactMemoryEngine::saveContact(QContact *theContact, QContactChangeSet &
     return true;
 }
 
-#include "moc_qcontactmemorybackend_p.cpp"
-
 QT_END_NAMESPACE_CONTACTS
+
+#include "moc_qcontactmemorybackend_p.cpp"
diff --git a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
index dcc0eea74..fe997ab3b 100644
--- a/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
+++ b/src/plugins/organizer/memory/qorganizeritemmemorybackend.cpp
@@ -1488,6 +1488,6 @@ void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerAbstract
     d->emitSharedSignals(&changeSet);
 }
 
-#include "moc_qorganizeritemmemorybackend_p.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizeritemmemorybackend_p.cpp"
diff --git a/src/plugins/organizer/skeleton/qorganizerskeleton.cpp b/src/plugins/organizer/skeleton/qorganizerskeleton.cpp
index c509c04b8..fe1ff514a 100644
--- a/src/plugins/organizer/skeleton/qorganizerskeleton.cpp
+++ b/src/plugins/organizer/skeleton/qorganizerskeleton.cpp
@@ -439,6 +439,6 @@ QList<QOrganizerItemType::ItemType> QOrganizerItemSkeletonEngine::supportedItemT
     return ret;
 }
 
-#include "moc_qorganizerskeleton_p.cpp"
-
 QT_END_NAMESPACE_ORGANIZER
+
+#include "moc_qorganizerskeleton_p.cpp"
diff --git a/src/plugins/versit/backuphandler/backupvcardhandler.cpp b/src/plugins/versit/backuphandler/backupvcardhandler.cpp
index 83d156950..d7036468b 100644
--- a/src/plugins/versit/backuphandler/backupvcardhandler.cpp
+++ b/src/plugins/versit/backuphandler/backupvcardhandler.cpp
@@ -270,6 +270,6 @@ void BackupVCardHandler::contactProcessed(
     mDetailNumber = 0;
 }
 
-#include "moc_backupvcardhandler.cpp"
-
 QT_END_NAMESPACE_VERSIT
+
+#include "moc_backupvcardhandler.cpp"
diff --git a/src/plugins/versit/vcardpreserver/vcardpreserver.cpp b/src/plugins/versit/vcardpreserver/vcardpreserver.cpp
index 6d9742099..7825bbe9c 100644
--- a/src/plugins/versit/vcardpreserver/vcardpreserver.cpp
+++ b/src/plugins/versit/vcardpreserver/vcardpreserver.cpp
@@ -184,6 +184,6 @@ void VCardPreserver::contactProcessed(const QContact& contact,
     Q_UNUSED(document)
 }
 
-#include "moc_vcardpreserver.cpp"
-
 QT_END_NAMESPACE_VERSIT
+
+#include "moc_vcardpreserver.cpp"
diff --git a/src/versit/qversitcontacthandler.cpp b/src/versit/qversitcontacthandler.cpp
index 06bccb795..9df47179a 100644
--- a/src/versit/qversitcontacthandler.cpp
+++ b/src/versit/qversitcontacthandler.cpp
@@ -145,5 +145,6 @@ QStringList QVersitContactHandlerFactory::keys() const
   handler provided by this factory.
  */
 
-#include "moc_qversitcontacthandler.cpp"
 QT_END_NAMESPACE_VERSIT
+
+#include "moc_qversitcontacthandler.cpp"
diff --git a/src/versit/qversitreader.cpp b/src/versit/qversitreader.cpp
index 4339c3a08..0964c5c89 100644
--- a/src/versit/qversitreader.cpp
+++ b/src/versit/qversitreader.cpp
@@ -275,6 +275,6 @@ QList<QVersitDocument> QVersitReader::results() const
     return d->mVersitDocuments;
 }
 
-#include "moc_qversitreader.cpp"
-
 QT_END_NAMESPACE_VERSIT
+
+#include "moc_qversitreader.cpp"
diff --git a/src/versit/qversitreader_p.cpp b/src/versit/qversitreader_p.cpp
index 2d4382625..e013810ba 100644
--- a/src/versit/qversitreader_p.cpp
+++ b/src/versit/qversitreader_p.cpp
@@ -1235,5 +1235,6 @@ void QVersitReaderPrivate::removeBackSlashEscaping(QString* text)
     }
 }
 
-#include "moc_qversitreader_p.cpp"
 QT_END_NAMESPACE_VERSIT
+
+#include "moc_qversitreader_p.cpp"
diff --git a/src/versit/qversitwriter.cpp b/src/versit/qversitwriter.cpp
index c29ef0c59..f377a6a3e 100644
--- a/src/versit/qversitwriter.cpp
+++ b/src/versit/qversitwriter.cpp
@@ -295,6 +295,6 @@ bool QVersitWriter::waitForFinished(int msec)
     }
 }
 
-#include "moc_qversitwriter.cpp"
-
 QT_END_NAMESPACE_VERSIT
+
+#include "moc_qversitwriter.cpp"
diff --git a/src/versit/qversitwriter_p.cpp b/src/versit/qversitwriter_p.cpp
index 541ebc30b..3b158382a 100644
--- a/src/versit/qversitwriter_p.cpp
+++ b/src/versit/qversitwriter_p.cpp
@@ -208,5 +208,6 @@ QVersitDocument::VersitType QVersitWriterPrivate::documentType() const
     return mType;
 }
 
-#include "moc_qversitwriter_p.cpp"
 QT_END_NAMESPACE_VERSIT
+
+#include "moc_qversitwriter_p.cpp"