diff --git a/app/urlinfo.h b/app/urlinfo.h
--- a/app/urlinfo.h
+++ b/app/urlinfo.h
@@ -102,6 +102,8 @@
     KTextEditor::Cursor cursor;
 };
 
+Q_DECLARE_TYPEINFO(UrlInfo, Q_MOVABLE_TYPE);
+
 QDataStream& operator<<(QDataStream& stream, const UrlInfo& info)
 {
     stream << info.url;
diff --git a/kdevplatform/debugger/framestack/framestackmodel.h b/kdevplatform/debugger/framestack/framestackmodel.h
--- a/kdevplatform/debugger/framestack/framestackmodel.h
+++ b/kdevplatform/debugger/framestack/framestackmodel.h
@@ -99,4 +99,6 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::FrameStackModel::ThreadItem, Q_MOVABLE_TYPE);
+
 #endif
diff --git a/kdevplatform/debugger/interfaces/iframestackmodel.h b/kdevplatform/debugger/interfaces/iframestackmodel.h
--- a/kdevplatform/debugger/interfaces/iframestackmodel.h
+++ b/kdevplatform/debugger/interfaces/iframestackmodel.h
@@ -93,4 +93,6 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::IFrameStackModel::FrameItem, Q_MOVABLE_TYPE);
+
 #endif
diff --git a/kdevplatform/interfaces/contextmenuextension.h b/kdevplatform/interfaces/contextmenuextension.h
--- a/kdevplatform/interfaces/contextmenuextension.h
+++ b/kdevplatform/interfaces/contextmenuextension.h
@@ -107,4 +107,6 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::ContextMenuExtension, Q_MOVABLE_TYPE);
+
 #endif
diff --git a/kdevplatform/interfaces/isourceformatter.h b/kdevplatform/interfaces/isourceformatter.h
--- a/kdevplatform/interfaces/isourceformatter.h
+++ b/kdevplatform/interfaces/isourceformatter.h
@@ -226,6 +226,8 @@
 
 Q_DECLARE_INTERFACE(KDevelop::ISourceFormatter, "org.kdevelop.ISourceFormatter")
 Q_DECLARE_TYPEINFO(KDevelop::SourceFormatterStyle::MimeHighlightPair, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(KDevelop::SourceFormatterStyle, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(KDevelop::SourceFormatterStyleItem, Q_MOVABLE_TYPE);
 
 #endif // KDEVPLATFORM_ISOURCEFORMATTER_H
 // kate: indent-mode cstyle; space-indent off; tab-width 4;
diff --git a/kdevplatform/language/duchain/identifier.h b/kdevplatform/language/duchain/identifier.h
--- a/kdevplatform/language/duchain/identifier.h
+++ b/kdevplatform/language/duchain/identifier.h
@@ -460,6 +460,7 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::IndexedTypeIdentifier, Q_MOVABLE_TYPE);
 Q_DECLARE_TYPEINFO(KDevelop::IndexedQualifiedIdentifier, Q_MOVABLE_TYPE);
 Q_DECLARE_TYPEINFO(KDevelop::IndexedIdentifier, Q_MOVABLE_TYPE);
 Q_DECLARE_METATYPE(KDevelop::IndexedQualifiedIdentifier)
diff --git a/kdevplatform/language/duchain/indexedtopducontext.h b/kdevplatform/language/duchain/indexedtopducontext.h
--- a/kdevplatform/language/duchain/indexedtopducontext.h
+++ b/kdevplatform/language/duchain/indexedtopducontext.h
@@ -142,5 +142,6 @@
 }
 
 Q_DECLARE_METATYPE(KDevelop::IndexedTopDUContext)
+Q_DECLARE_TYPEINFO(KDevelop::IndexedTopDUContext, Q_MOVABLE_TYPE);
 
 #endif // KDEVPLATFORM_INDEXEDTOPDUCONTEXT_H
diff --git a/kdevplatform/language/duchain/navigation/navigationaction.h b/kdevplatform/language/duchain/navigation/navigationaction.h
--- a/kdevplatform/language/duchain/navigation/navigationaction.h
+++ b/kdevplatform/language/duchain/navigation/navigationaction.h
@@ -69,4 +69,6 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::NavigationAction, Q_MOVABLE_TYPE);
+
 #endif
diff --git a/kdevplatform/language/duchain/topducontext.h b/kdevplatform/language/duchain/topducontext.h
--- a/kdevplatform/language/duchain/topducontext.h
+++ b/kdevplatform/language/duchain/topducontext.h
@@ -371,6 +371,8 @@
 }
 
 }
+
+Q_DECLARE_TYPEINFO(KDevelop::ReferencedTopDUContext, Q_MOVABLE_TYPE);
 Q_DECLARE_METATYPE(KDevelop::ReferencedTopDUContext)
 
 #endif // KDEVPLATFORM_TOPDUCONTEXT_H
diff --git a/kdevplatform/language/duchain/topducontextdynamicdata.h b/kdevplatform/language/duchain/topducontextdynamicdata.h
--- a/kdevplatform/language/duchain/topducontextdynamicdata.h
+++ b/kdevplatform/language/duchain/topducontextdynamicdata.h
@@ -182,5 +182,6 @@
 }
 
 Q_DECLARE_TYPEINFO(KDevelop::TopDUContextDynamicData::ItemDataInfo, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(KDevelop::TopDUContextDynamicData::ArrayWithPosition, Q_MOVABLE_TYPE);
 
 #endif
diff --git a/kdevplatform/language/editor/documentrange.h b/kdevplatform/language/editor/documentrange.h
--- a/kdevplatform/language/editor/documentrange.h
+++ b/kdevplatform/language/editor/documentrange.h
@@ -54,6 +54,7 @@
 };
 
 }
+Q_DECLARE_TYPEINFO(KDevelop::DocumentRange, Q_MOVABLE_TYPE);
 
 namespace QTest {
 template<>
diff --git a/kdevplatform/language/editor/modificationrevision.cpp b/kdevplatform/language/editor/modificationrevision.cpp
--- a/kdevplatform/language/editor/modificationrevision.cpp
+++ b/kdevplatform/language/editor/modificationrevision.cpp
@@ -29,17 +29,18 @@
 /// @todo Listen to filesystem changes (together with the project manager)
 /// and call fileModificationCache().clear(...) when a file has changed
 
-namespace KDevelop {
+using namespace KDevelop;
 
-const int cacheModificationTimesForSeconds = 30;
+const int KDevelop::cacheModificationTimesForSeconds = 30;
 
 QMutex fileModificationTimeCacheMutex(QMutex::Recursive);
 
 struct FileModificationCache
 {
   QDateTime m_readTime;
   QDateTime m_modificationTime;
 };
+Q_DECLARE_TYPEINFO(FileModificationCache, Q_MOVABLE_TYPE);
 
 typedef QHash<KDevelop::IndexedString, FileModificationCache> FileModificationMap;
 
@@ -141,6 +142,3 @@
 {
   return QStringLiteral("%1 (rev %2)").arg(QDateTime::fromTime_t(modificationTime).time().toString()).arg(revision);
 }
-
-}
-
diff --git a/kdevplatform/language/highlighting/codehighlighting.h b/kdevplatform/language/highlighting/codehighlighting.h
--- a/kdevplatform/language/highlighting/codehighlighting.h
+++ b/kdevplatform/language/highlighting/codehighlighting.h
@@ -215,6 +215,8 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::HighlightedRange, Q_MOVABLE_TYPE);
+
 #endif
 
 // kate: space-indent on; indent-width 2; remove-trailing-spaces all; show-tabs on; tab-indents on; tab-width 2;
diff --git a/kdevplatform/project/projectbuildsetmodel.h b/kdevplatform/project/projectbuildsetmodel.h
--- a/kdevplatform/project/projectbuildsetmodel.h
+++ b/kdevplatform/project/projectbuildsetmodel.h
@@ -89,6 +89,8 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::BuildItem, Q_MOVABLE_TYPE);
+
 #endif
 
 //kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle;
diff --git a/kdevplatform/shell/documentcontroller.cpp b/kdevplatform/shell/documentcontroller.cpp
--- a/kdevplatform/shell/documentcontroller.cpp
+++ b/kdevplatform/shell/documentcontroller.cpp
@@ -70,11 +70,10 @@
 
 #define EMPTY_DOCUMENT_URL i18n("Untitled")
 
-namespace KDevelop
-{
+using namespace KDevelop;
 
 
-class DocumentControllerPrivate
+class KDevelop::DocumentControllerPrivate
 {
 public:
     struct OpenFileResult
@@ -556,6 +555,7 @@
     KRecentFilesAction* fileOpenRecent;
     KTextEditor::Document* globalTextEditorInstance;
 };
+Q_DECLARE_TYPEINFO(KDevelop::DocumentControllerPrivate::HistoryEntry, Q_MOVABLE_TYPE);
 
 DocumentController::DocumentController( QObject *parent )
         : IDocumentController( parent )
@@ -1229,6 +1229,4 @@
     }
 }
 
-}
-
 #include "moc_documentcontroller.cpp"
diff --git a/kdevplatform/shell/projectinfopage.h b/kdevplatform/shell/projectinfopage.h
--- a/kdevplatform/shell/projectinfopage.h
+++ b/kdevplatform/shell/projectinfopage.h
@@ -47,4 +47,6 @@
 
 }
 
+Q_DECLARE_TYPEINFO(ProjectFileChoice, Q_MOVABLE_TYPE);
+
 #endif
diff --git a/kdevplatform/shell/session.h b/kdevplatform/shell/session.h
--- a/kdevplatform/shell/session.h
+++ b/kdevplatform/shell/session.h
@@ -83,6 +83,7 @@
 }
 
 Q_DECLARE_METATYPE( KDevelop::Session* )
+Q_DECLARE_TYPEINFO(KDevelop::SessionInfo, Q_MOVABLE_TYPE);
 
 #endif
 
diff --git a/kdevplatform/util/kdevformatfile.h b/kdevplatform/util/kdevformatfile.h
--- a/kdevplatform/util/kdevformatfile.h
+++ b/kdevplatform/util/kdevformatfile.h
@@ -73,3 +73,4 @@
 
 }
 
+Q_DECLARE_TYPEINFO(KDevelop::KDevFormatLine, Q_MOVABLE_TYPE);
diff --git a/plugins/clang/duchain/clanghelpers.h b/plugins/clang/duchain/clanghelpers.h
--- a/plugins/clang/duchain/clanghelpers.h
+++ b/plugins/clang/duchain/clanghelpers.h
@@ -40,6 +40,8 @@
     KDevelop::CursorInRevision location;
 };
 
+Q_DECLARE_TYPEINFO(Import, Q_MOVABLE_TYPE);
+
 using Imports = QMultiHash<CXFile, Import>;
 using IncludeFileContexts = QHash<CXFile, KDevelop::ReferencedTopDUContext>;
 
diff --git a/plugins/clang/duchain/clangproblem.h b/plugins/clang/duchain/clangproblem.h
--- a/plugins/clang/duchain/clangproblem.h
+++ b/plugins/clang/duchain/clangproblem.h
@@ -46,6 +46,7 @@
             && currentText == other.currentText;
     }
 };
+Q_DECLARE_TYPEINFO(ClangFixit, Q_MOVABLE_TYPE);
 
 namespace QTest {
 template<>
diff --git a/plugins/clang/duchain/todoextractor.cpp b/plugins/clang/duchain/todoextractor.cpp
--- a/plugins/clang/duchain/todoextractor.cpp
+++ b/plugins/clang/duchain/todoextractor.cpp
@@ -151,6 +151,8 @@
 
 }
 
+Q_DECLARE_TYPEINFO(CommentTodoParser::Result, Q_MOVABLE_TYPE);
+
 TodoExtractor::TodoExtractor(CXTranslationUnit unit, CXFile file)
     : m_unit(unit)
     , m_file(file)
diff --git a/plugins/custom-buildsystem/custombuildsystemconfig.h b/plugins/custom-buildsystem/custombuildsystemconfig.h
--- a/plugins/custom-buildsystem/custombuildsystemconfig.h
+++ b/plugins/custom-buildsystem/custombuildsystemconfig.h
@@ -38,6 +38,7 @@
 };
 
 Q_DECLARE_METATYPE( CustomBuildSystemTool )
+Q_DECLARE_TYPEINFO(CustomBuildSystemTool, Q_MOVABLE_TYPE);
 
 struct CustomBuildSystemConfig
 {
@@ -57,4 +58,6 @@
     }
 };
 
+Q_DECLARE_TYPEINFO(CustomBuildSystemConfig, Q_MOVABLE_TYPE);
+
 #endif
diff --git a/plugins/custom-definesandincludes/compilerprovider/settingsmanager.h b/plugins/custom-definesandincludes/compilerprovider/settingsmanager.h
--- a/plugins/custom-definesandincludes/compilerprovider/settingsmanager.h
+++ b/plugins/custom-definesandincludes/compilerprovider/settingsmanager.h
@@ -62,6 +62,7 @@
 };
 
 Q_DECLARE_METATYPE(ParserArguments);
+Q_DECLARE_TYPEINFO(ParserArguments, Q_MOVABLE_TYPE);
 
 struct ConfigEntry
 {
@@ -76,6 +77,7 @@
     // FIXME: get rid of this but stay backwards compatible
     void setDefines(const QHash<QString, QVariant>& defines);
 };
+Q_DECLARE_TYPEINFO(ConfigEntry, Q_MOVABLE_TYPE);
 
 namespace Utils
 {
diff --git a/plugins/debuggercommon/mi/milexer.h b/plugins/debuggercommon/mi/milexer.h
--- a/plugins/debuggercommon/mi/milexer.h
+++ b/plugins/debuggercommon/mi/milexer.h
@@ -146,4 +146,6 @@
 } // end of MI
 } // end of KDevMI
 
+ Q_DECLARE_TYPEINFO(KDevMI::MI::Token, Q_PRIMITIVE_TYPE);
+
 #endif
diff --git a/plugins/debuggercommon/registers/modelsmanager.cpp b/plugins/debuggercommon/registers/modelsmanager.cpp
--- a/plugins/debuggercommon/registers/modelsmanager.cpp
+++ b/plugins/debuggercommon/registers/modelsmanager.cpp
@@ -63,6 +63,8 @@
 
 } // end of namespace KDevMI
 
+ Q_DECLARE_TYPEINFO(KDevMI::Model, Q_MOVABLE_TYPE);
+
 using namespace KDevMI;
 
 ModelsManager::ModelsManager(QObject* parent) : QObject(parent), m_models(new Models), m_controller(nullptr), m_config(KSharedConfig::openConfig()->group("Register models")) {}
diff --git a/plugins/grepview/grepjob.h b/plugins/grepview/grepjob.h
--- a/plugins/grepview/grepjob.h
+++ b/plugins/grepview/grepjob.h
@@ -53,6 +53,9 @@
     QString searchPaths;
 };
 
+Q_DECLARE_TYPEINFO(GrepJobSettings, Q_MOVABLE_TYPE);
+
+
 class GrepJob : public KJob, public KDevelop::IStatus
 {
     Q_OBJECT
diff --git a/plugins/qmljs/navigation/propertypreviewwidget.h b/plugins/qmljs/navigation/propertypreviewwidget.h
--- a/plugins/qmljs/navigation/propertypreviewwidget.h
+++ b/plugins/qmljs/navigation/propertypreviewwidget.h
@@ -50,6 +50,9 @@
     QString classContains;
 };
 
+Q_DECLARE_TYPEINFO(SupportedProperty, Q_MOVABLE_TYPE);
+
+
 // This class is responsible for creating the property widgets for editing QML properties
 // with e.g. sliders. It knows which properties are supported, and creates a widget from
 // a QML file for each supported property when requested. For the actual implementations