diff --git a/src/libs/clangbackendipc/clangbackendipc-lib.pri b/src/libs/clangbackendipc/clangbackendipc-lib.pri
index e930763843aef460c69cf86f52dfb314c493cc62..3f3758772dea5f71580e29795f1cae74928462fc 100644
--- a/src/libs/clangbackendipc/clangbackendipc-lib.pri
+++ b/src/libs/clangbackendipc/clangbackendipc-lib.pri
@@ -8,163 +8,164 @@ QT += network
 
 INCLUDEPATH += $$PWD
 
-SOURCES += $$PWD/clangcodemodelserverinterface.cpp \
-    $$PWD/clangcodemodelserverproxy.cpp \
+SOURCES += \
+    $$PWD/cancelmessage.cpp \
+    $$PWD/clangbackendipcdebugutils.cpp \
     $$PWD/clangcodemodelclientinterface.cpp \
-    $$PWD/cmbendmessage.cpp \
-    $$PWD/cmbalivemessage.cpp \
     $$PWD/clangcodemodelclientproxy.cpp \
-    $$PWD/writemessageblock.cpp \
-    $$PWD/readmessageblock.cpp \
-    $$PWD/ipcinterface.cpp \
-    $$PWD/connectionserver.cpp \
-    $$PWD/connectionclient.cpp \
-    $$PWD/cmbechomessage.cpp \
-    $$PWD/cmbregistertranslationunitsforeditormessage.cpp \
-    $$PWD/filecontainer.cpp \
-    $$PWD/cmbunregistertranslationunitsforeditormessage.cpp \
-    $$PWD/cmbcompletecodemessage.cpp \
+    $$PWD/clangcodemodelconnectionclient.cpp \
+    $$PWD/clangcodemodelserverinterface.cpp \
+    $$PWD/clangcodemodelserverproxy.cpp \
+    $$PWD/cmbalivemessage.cpp \
     $$PWD/cmbcodecompletedmessage.cpp \
-    $$PWD/codecompletion.cpp \
+    $$PWD/cmbcompletecodemessage.cpp \
+    $$PWD/cmbechomessage.cpp \
+    $$PWD/cmbendmessage.cpp \
     $$PWD/cmbregisterprojectsforeditormessage.cpp \
+    $$PWD/cmbregistertranslationunitsforeditormessage.cpp \
     $$PWD/cmbunregisterprojectsforeditormessage.cpp \
-    $$PWD/translationunitdoesnotexistmessage.cpp \
+    $$PWD/cmbunregistertranslationunitsforeditormessage.cpp \
     $$PWD/codecompletionchunk.cpp \
-    $$PWD/projectpartcontainer.cpp \
-    $$PWD/projectpartsdonotexistmessage.cpp \
-    $$PWD/lineprefixer.cpp \
-    $$PWD/clangbackendipcdebugutils.cpp \
+    $$PWD/codecompletion.cpp \
+    $$PWD/connectionclient.cpp \
+    $$PWD/connectionserver.cpp \
     $$PWD/diagnosticcontainer.cpp \
-    $$PWD/sourcerangecontainer.cpp \
-    $$PWD/sourcelocationcontainer.cpp \
+    $$PWD/documentannotationschangedmessage.cpp \
+    $$PWD/dynamicastmatcherdiagnosticcontainer.cpp \
+    $$PWD/dynamicastmatcherdiagnosticcontextcontainer.cpp \
+    $$PWD/dynamicastmatcherdiagnosticmessagecontainer.cpp \
+    $$PWD/filecontainer.cpp \
+    $$PWD/filecontainerv2.cpp \
+    $$PWD/filepath.cpp \
     $$PWD/fixitcontainer.cpp \
-    $$PWD/requestdocumentannotations.cpp \
-    $$PWD/requestreferencesmessage.cpp \
-    $$PWD/registerunsavedfilesforeditormessage.cpp \
-    $$PWD/unregisterunsavedfilesforeditormessage.cpp \
-    $$PWD/updatetranslationunitsforeditormessage.cpp \
-    $$PWD/updatevisibletranslationunitsmessage.cpp \
     $$PWD/highlightingmarkcontainer.cpp \
-    $$PWD/refactoringclientinterface.cpp \
+    $$PWD/ipcclientinterface.cpp \
+    $$PWD/ipcinterface.cpp \
+    $$PWD/ipcserverinterface.cpp \
+    $$PWD/lineprefixer.cpp \
     $$PWD/messageenvelop.cpp \
+    $$PWD/pchmanagerclientinterface.cpp \
+    $$PWD/pchmanagerclientproxy.cpp \
+    $$PWD/pchmanagerserverinterface.cpp \
+    $$PWD/pchmanagerserverproxy.cpp \
+    $$PWD/precompiledheadersupdatedmessage.cpp \
+    $$PWD/projectpartcontainer.cpp \
+    $$PWD/projectpartcontainerv2.cpp \
+    $$PWD/projectpartpch.cpp \
+    $$PWD/projectpartsdonotexistmessage.cpp \
+    $$PWD/readmessageblock.cpp \
+    $$PWD/refactoringclientinterface.cpp \
+    $$PWD/refactoringclientproxy.cpp \
     $$PWD/refactoringserverinterface.cpp \
     $$PWD/refactoringserverproxy.cpp \
-    $$PWD/ipcclientinterface.cpp \
-    $$PWD/ipcserverinterface.cpp \
-    $$PWD/clangcodemodelconnectionclient.cpp \
-    $$PWD/documentannotationschangedmessage.cpp \
     $$PWD/referencesmessage.cpp \
-    $$PWD/refactoringclientproxy.cpp \
-    $$PWD/sourcelocationscontainer.cpp \
-    $$PWD/sourcelocationcontainerv2.cpp \
-    $$PWD/sourcelocationsforrenamingmessage.cpp \
+    $$PWD/registerunsavedfilesforeditormessage.cpp \
+    $$PWD/removepchprojectpartsmessage.cpp \
+    $$PWD/requestdocumentannotations.cpp \
+    $$PWD/requestreferencesmessage.cpp \
     $$PWD/requestsourcelocationforrenamingmessage.cpp \
-    $$PWD/filepath.cpp \
-    $$PWD/sourcerangescontainer.cpp \
+    $$PWD/requestsourcerangesanddiagnosticsforquerymessage.cpp \
+    $$PWD/requestsourcerangesforquerymessage.cpp \
     $$PWD/sourcefilepathcontainerbase.cpp \
+    $$PWD/sourcelocationcontainer.cpp \
+    $$PWD/sourcelocationcontainerv2.cpp \
+    $$PWD/sourcelocationscontainer.cpp \
+    $$PWD/sourcelocationsforrenamingmessage.cpp \
+    $$PWD/sourcerangecontainer.cpp \
     $$PWD/sourcerangecontainerv2.cpp \
-    $$PWD/dynamicastmatcherdiagnosticcontainer.cpp \
-    $$PWD/dynamicastmatcherdiagnosticcontextcontainer.cpp \
-    $$PWD/dynamicastmatcherdiagnosticmessagecontainer.cpp \
-    $$PWD/requestsourcerangesanddiagnosticsforquerymessage.cpp \
     $$PWD/sourcerangesanddiagnosticsforquerymessage.cpp \
+    $$PWD/sourcerangescontainer.cpp \
+    $$PWD/sourcerangesforquerymessage.cpp \
     $$PWD/sourcerangewithtextcontainer.cpp \
-    $$PWD/filecontainerv2.cpp \
-    $$PWD/cancelmessage.cpp \
-    $$PWD/pchmanagerclientinterface.cpp \
-    $$PWD/pchmanagerserverinterface.cpp \
-    $$PWD/projectpartcontainerv2.cpp \
+    $$PWD/translationunitdoesnotexistmessage.cpp \
+    $$PWD/unregisterunsavedfilesforeditormessage.cpp \
     $$PWD/updatepchprojectpartsmessage.cpp \
-    $$PWD/pchmanagerserverproxy.cpp \
-    $$PWD/pchmanagerclientproxy.cpp \
-    $$PWD/projectpartpch.cpp \
-    $$PWD/precompiledheadersupdatedmessage.cpp \
-    $$PWD/removepchprojectpartsmessage.cpp \
-    $$PWD/sourcerangesforquerymessage.cpp \
-    $$PWD/requestsourcerangesforquerymessage.cpp
+    $$PWD/updatetranslationunitsforeditormessage.cpp \
+    $$PWD/updatevisibletranslationunitsmessage.cpp \
+    $$PWD/writemessageblock.cpp \
 
 HEADERS += \
+    $$PWD/cancelmessage.h \
+    $$PWD/clangbackendipcdebugutils.h \
+    $$PWD/clangbackendipc_global.h \
+    $$PWD/clangcodemodelclientinterface.h \
+    $$PWD/clangcodemodelclientmessages.h \
+    $$PWD/clangcodemodelclientproxy.h \
+    $$PWD/clangcodemodelconnectionclient.h \
     $$PWD/clangcodemodelserverinterface.h \
+    $$PWD/clangcodemodelservermessages.h \
     $$PWD/clangcodemodelserverproxy.h \
-    $$PWD/clangcodemodelclientinterface.h \
-    $$PWD/cmbendmessage.h \
+    $$PWD/clangrefactoringclientmessages.h \
+    $$PWD/clangrefactoringmessages.h \
+    $$PWD/clangrefactoringservermessages.h \
     $$PWD/cmbalivemessage.h \
-    $$PWD/clangcodemodelclientproxy.h \
-    $$PWD/writemessageblock.h \
-    $$PWD/readmessageblock.h \
-    $$PWD/ipcinterface.h \
-    $$PWD/connectionserver.h \
-    $$PWD/connectionclient.h \
-    $$PWD/cmbechomessage.h \
-    $$PWD/cmbregistertranslationunitsforeditormessage.h \
-    $$PWD/filecontainer.h \
-    $$PWD/cmbunregistertranslationunitsforeditormessage.h \
-    $$PWD/cmbcompletecodemessage.h \
     $$PWD/cmbcodecompletedmessage.h \
-    $$PWD/codecompletion.h \
+    $$PWD/cmbcompletecodemessage.h \
+    $$PWD/cmbechomessage.h \
+    $$PWD/cmbendmessage.h \
     $$PWD/cmbregisterprojectsforeditormessage.h \
+    $$PWD/cmbregistertranslationunitsforeditormessage.h \
     $$PWD/cmbunregisterprojectsforeditormessage.h \
-    $$PWD/translationunitdoesnotexistmessage.h \
+    $$PWD/cmbunregistertranslationunitsforeditormessage.h \
     $$PWD/codecompletionchunk.h \
-    $$PWD/projectpartcontainer.h \
-    $$PWD/projectpartsdonotexistmessage.h \
-    $$PWD/clangbackendipc_global.h \
-    $$PWD/lineprefixer.h \
-    $$PWD/clangbackendipcdebugutils.h \
+    $$PWD/codecompletion.h \
+    $$PWD/connectionclient.h \
+    $$PWD/connectionserver.h \
     $$PWD/diagnosticcontainer.h \
-    $$PWD/sourcerangecontainer.h \
-    $$PWD/sourcelocationcontainer.h \
+    $$PWD/documentannotationschangedmessage.h \
+    $$PWD/dynamicastmatcherdiagnosticcontainer.h \
+    $$PWD/dynamicastmatcherdiagnosticcontextcontainer.h \
+    $$PWD/dynamicastmatcherdiagnosticmessagecontainer.h \
+    $$PWD/dynamicmatcherdiagnostics.h \
+    $$PWD/filecontainer.h \
+    $$PWD/filecontainerv2.h \
+    $$PWD/filepath.h \
     $$PWD/fixitcontainer.h \
-    $$PWD/requestdocumentannotations.h \
-    $$PWD/referencesmessage.h \
-    $$PWD/requestreferencesmessage.h \
-    $$PWD/registerunsavedfilesforeditormessage.h \
-    $$PWD/unregisterunsavedfilesforeditormessage.h \
-    $$PWD/updatetranslationunitsforeditormessage.h \
-    $$PWD/updatevisibletranslationunitsmessage.h \
     $$PWD/highlightingmarkcontainer.h \
-    $$PWD/messageenvelop.h \
     $$PWD/ipcclientinterface.h \
+    $$PWD/ipcinterface.h \
     $$PWD/ipcserverinterface.h \
-    $$PWD/clangcodemodelconnectionclient.h \
-    $$PWD/documentannotationschangedmessage.h \
+    $$PWD/lineprefixer.h \
+    $$PWD/messageenvelop.h \
+    $$PWD/pchmanagerclientinterface.h \
+    $$PWD/pchmanagerclientproxy.h \
+    $$PWD/pchmanagerserverinterface.h \
+    $$PWD/pchmanagerserverproxy.h \
+    $$PWD/precompiledheadersupdatedmessage.h \
+    $$PWD/projectpartcontainer.h \
+    $$PWD/projectpartcontainerv2.h \
+    $$PWD/projectpartpch.h \
+    $$PWD/projectpartsdonotexistmessage.h \
+    $$PWD/readmessageblock.h \
     $$PWD/refactoringclientinterface.h \
+    $$PWD/refactoringclientproxy.h \
     $$PWD/refactoringserverinterface.h \
     $$PWD/refactoringserverproxy.h \
-    $$PWD/refactoringclientproxy.h \
-    $$PWD/sourcelocationscontainer.h \
-    $$PWD/sourcelocationcontainerv2.h \
-    $$PWD/sourcelocationsforrenamingmessage.h \
+    $$PWD/referencesmessage.h \
+    $$PWD/registerunsavedfilesforeditormessage.h \
+    $$PWD/removepchprojectpartsmessage.h \
+    $$PWD/requestdocumentannotations.h \
+    $$PWD/requestreferencesmessage.h \
     $$PWD/requestsourcelocationforrenamingmessage.h \
-    $$PWD/filepath.h \
-    $$PWD/sourcerangescontainer.h \
+    $$PWD/requestsourcerangesanddiagnosticsforquerymessage.h \
+    $$PWD/requestsourcerangesforquerymessage.h \
     $$PWD/sourcefilepathcontainerbase.h \
+    $$PWD/sourcelocationcontainer.h \
+    $$PWD/sourcelocationcontainerv2.h \
+    $$PWD/sourcelocationscontainer.h \
+    $$PWD/sourcelocationsforrenamingmessage.h \
+    $$PWD/sourcerangecontainer.h \
     $$PWD/sourcerangecontainerv2.h \
-    $$PWD/dynamicmatcherdiagnostics.h \
-    $$PWD/dynamicastmatcherdiagnosticcontainer.h \
-    $$PWD/dynamicastmatcherdiagnosticcontextcontainer.h \
-    $$PWD/dynamicastmatcherdiagnosticmessagecontainer.h \
-    $$PWD/requestsourcerangesanddiagnosticsforquerymessage.h \
     $$PWD/sourcerangesanddiagnosticsforquerymessage.h \
+    $$PWD/sourcerangescontainer.h \
+    $$PWD/sourcerangesforquerymessage.h \
     $$PWD/sourcerangewithtextcontainer.h \
-    $$PWD/filecontainerv2.h \
-    $$PWD/cancelmessage.h \
-    $$PWD/pchmanagerclientinterface.h \
-    $$PWD/pchmanagerserverinterface.h \
-    $$PWD/projectpartcontainerv2.h \
-    $$PWD/updatepchprojectpartsmessage.h \
-    $$PWD/pchmanagerserverproxy.h \
-    $$PWD/pchmanagerclientproxy.h \
-    $$PWD/projectpartpch.h \
-    $$PWD/precompiledheadersupdatedmessage.h \
     $$PWD/stringcache.h \
-    $$PWD/removepchprojectpartsmessage.h \
-    $$PWD/clangcodemodelclientmessages.h \
-    $$PWD/clangcodemodelservermessages.h \
-    $$PWD/sourcerangesforquerymessage.h \
-    $$PWD/clangrefactoringmessages.h \
-    $$PWD/clangrefactoringclientmessages.h \
-    $$PWD/clangrefactoringservermessages.h \
-    $$PWD/requestsourcerangesforquerymessage.h
+    $$PWD/translationunitdoesnotexistmessage.h \
+    $$PWD/unregisterunsavedfilesforeditormessage.h \
+    $$PWD/updatepchprojectpartsmessage.h \
+    $$PWD/updatetranslationunitsforeditormessage.h \
+    $$PWD/updatevisibletranslationunitsmessage.h \
+    $$PWD/writemessageblock.h \
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs
index e6a2f1cde2802286119f0edbebd9819117bc7e9c..eb46d8f2bd00b8d9cae215254a0df444063f4a98 100644
--- a/src/plugins/clangcodemodel/clangcodemodel.qbs
+++ b/src/plugins/clangcodemodel/clangcodemodel.qbs
@@ -43,9 +43,9 @@ QtcPlugin {
         "clangassistproposalmodel.h",
         "clangbackendipcintegration.cpp",
         "clangbackendipcintegration.h",
-        "clangcodemodel.qrc",
         "clangcodemodelplugin.cpp",
         "clangcodemodelplugin.h",
+        "clangcodemodel.qrc",
         "clangcompletionassistinterface.cpp",
         "clangcompletionassistinterface.h",
         "clangcompletionassistprocessor.cpp",
diff --git a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
index c598eece8b50646e3052d83e7978b596fba0179a..06be9be18de86fac056b8564ef76cc0a009d62bc 100644
--- a/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
+++ b/src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
@@ -1,101 +1,103 @@
 INCLUDEPATH += $$PWD
 
-HEADERS += $$PWD/clangcodemodelserver.h \
-    $$PWD/codecompleter.h \
-    $$PWD/clangstring.h \
-    $$PWD/clangcodecompleteresults.h \
-    $$PWD/codecompletionsextractor.h \
-    $$PWD/unsavedfile.h \
-    $$PWD/unsavedfiles.h \
-    $$PWD/projects.h \
-    $$PWD/clangdocuments.h \
-    $$PWD/projectpart.h \
-    $$PWD/codecompletionchunkconverter.h \
-    $$PWD/diagnosticset.h \
-    $$PWD/diagnostic.h \
-    $$PWD/sourcelocation.h \
-    $$PWD/sourcerange.h \
-    $$PWD/fixit.h \
-    $$PWD/diagnosticsetiterator.h \
-    $$PWD/clangfilesystemwatcher.h \
-    $$PWD/commandlinearguments.h \
-    $$PWD/cursor.h \
-    $$PWD/skippedsourceranges.h \
-    $$PWD/clangdocument.h \
-    $$PWD/clangtranslationunitupdater.h \
-    $$PWD/clangtype.h \
-    $$PWD/highlightingmark.h \
-    $$PWD/highlightingmarks.h \
-    $$PWD/highlightingmarksiterator.h \
-    $$PWD/utf8positionfromlinecolumn.h \
+HEADERS += \
     $$PWD/clangasyncjob.h \
     $$PWD/clangbackend_global.h \
+    $$PWD/clangclock.h \
+    $$PWD/clangcodecompleteresults.h \
+    $$PWD/clangcodemodelserver.h \
     $$PWD/clangcompletecodejob.h \
     $$PWD/clangcreateinitialdocumentpreamblejob.h \
+    $$PWD/clangdocument.h \
+    $$PWD/clangdocumentprocessor.h \
+    $$PWD/clangdocumentprocessors.h \
+    $$PWD/clangdocuments.h \
+    $$PWD/clangexceptions.h \
     $$PWD/clangfilepath.h \
+    $$PWD/clangfilesystemwatcher.h \
     $$PWD/clangiasyncjob.h \
     $$PWD/clangjobcontext.h \
     $$PWD/clangjobqueue.h \
     $$PWD/clangjobrequest.h \
     $$PWD/clangjobs.h \
+    $$PWD/clangparsesupportivetranslationunitjob.h \
+    $$PWD/clangreferencescollector.h \
+    $$PWD/clangreparsesupportivetranslationunitjob.h \
     $$PWD/clangrequestdocumentannotationsjob.h \
+    $$PWD/clangrequestreferencesjob.h \
+    $$PWD/clangstring.h \
+    $$PWD/clangsupportivetranslationunitinitializer.h \
     $$PWD/clangtranslationunit.h \
+    $$PWD/clangtranslationunits.h \
+    $$PWD/clangtranslationunitupdater.h \
+    $$PWD/clangtype.h \
     $$PWD/clangunsavedfilesshallowarguments.h \
     $$PWD/clangupdatedocumentannotationsjob.h \
-    $$PWD/clangexceptions.h \
-    $$PWD/clangdocumentprocessor.h \
-    $$PWD/clangdocumentprocessors.h \
-    $$PWD/clangtranslationunits.h \
-    $$PWD/clangclock.h \
-    $$PWD/clangsupportivetranslationunitinitializer.h \
-    $$PWD/clangparsesupportivetranslationunitjob.h \
-    $$PWD/clangreparsesupportivetranslationunitjob.h \
-    $$PWD/clangrequestreferencesjob.h \
-    $$PWD/clangreferencescollector.h
+    $$PWD/codecompleter.h \
+    $$PWD/codecompletionchunkconverter.h \
+    $$PWD/codecompletionsextractor.h \
+    $$PWD/commandlinearguments.h \
+    $$PWD/cursor.h \
+    $$PWD/diagnostic.h \
+    $$PWD/diagnosticset.h \
+    $$PWD/diagnosticsetiterator.h \
+    $$PWD/fixit.h \
+    $$PWD/highlightingmark.h \
+    $$PWD/highlightingmarks.h \
+    $$PWD/highlightingmarksiterator.h \
+    $$PWD/projectpart.h \
+    $$PWD/projects.h \
+    $$PWD/skippedsourceranges.h \
+    $$PWD/sourcelocation.h \
+    $$PWD/sourcerange.h \
+    $$PWD/unsavedfile.h \
+    $$PWD/unsavedfiles.h \
+    $$PWD/utf8positionfromlinecolumn.h \
 
-SOURCES += $$PWD/clangcodemodelserver.cpp \
-    $$PWD/codecompleter.cpp \
+SOURCES += \
     $$PWD/clangcodecompleteresults.cpp \
-    $$PWD/codecompletionsextractor.cpp \
-    $$PWD/unsavedfile.cpp \
-    $$PWD/unsavedfiles.cpp \
-    $$PWD/projects.cpp \
-    $$PWD/clangdocuments.cpp \
-    $$PWD/projectpart.cpp \
-    $$PWD/codecompletionchunkconverter.cpp \
-    $$PWD/diagnosticset.cpp \
-    $$PWD/diagnostic.cpp \
-    $$PWD/sourcelocation.cpp \
-    $$PWD/sourcerange.cpp \
-    $$PWD/fixit.cpp \
-    $$PWD/clangfilesystemwatcher.cpp \
-    $$PWD/commandlinearguments.cpp \
-    $$PWD/cursor.cpp \
-    $$PWD/skippedsourceranges.cpp \
-    $$PWD/clangdocument.cpp \
-    $$PWD/clangtranslationunitupdater.cpp \
-    $$PWD/clangtype.cpp \
-    $$PWD/highlightingmark.cpp \
-    $$PWD/highlightingmarks.cpp \
-    $$PWD/utf8positionfromlinecolumn.cpp \
+    $$PWD/clangcodemodelserver.cpp \
     $$PWD/clangcompletecodejob.cpp \
     $$PWD/clangcreateinitialdocumentpreamblejob.cpp \
+    $$PWD/clangdocument.cpp \
+    $$PWD/clangdocumentprocessor.cpp \
+    $$PWD/clangdocumentprocessors.cpp \
+    $$PWD/clangdocuments.cpp \
+    $$PWD/clangexceptions.cpp \
     $$PWD/clangfilepath.cpp \
+    $$PWD/clangfilesystemwatcher.cpp \
     $$PWD/clangiasyncjob.cpp \
     $$PWD/clangjobcontext.cpp \
     $$PWD/clangjobqueue.cpp \
     $$PWD/clangjobrequest.cpp \
     $$PWD/clangjobs.cpp \
+    $$PWD/clangparsesupportivetranslationunitjob.cpp \
+    $$PWD/clangreferencescollector.cpp \
+    $$PWD/clangreparsesupportivetranslationunitjob.cpp \
     $$PWD/clangrequestdocumentannotationsjob.cpp \
+    $$PWD/clangrequestreferencesjob.cpp \
+    $$PWD/clangsupportivetranslationunitinitializer.cpp \
     $$PWD/clangtranslationunit.cpp \
+    $$PWD/clangtranslationunits.cpp \
+    $$PWD/clangtranslationunitupdater.cpp \
+    $$PWD/clangtype.cpp \
     $$PWD/clangunsavedfilesshallowarguments.cpp \
     $$PWD/clangupdatedocumentannotationsjob.cpp \
-    $$PWD/clangexceptions.cpp \
-    $$PWD/clangdocumentprocessor.cpp \
-    $$PWD/clangdocumentprocessors.cpp \
-    $$PWD/clangtranslationunits.cpp \
-    $$PWD/clangsupportivetranslationunitinitializer.cpp \
-    $$PWD/clangparsesupportivetranslationunitjob.cpp \
-    $$PWD/clangreparsesupportivetranslationunitjob.cpp \
-    $$PWD/clangrequestreferencesjob.cpp \
-    $$PWD/clangreferencescollector.cpp
+    $$PWD/codecompleter.cpp \
+    $$PWD/codecompletionchunkconverter.cpp \
+    $$PWD/codecompletionsextractor.cpp \
+    $$PWD/commandlinearguments.cpp \
+    $$PWD/cursor.cpp \
+    $$PWD/diagnostic.cpp \
+    $$PWD/diagnosticset.cpp \
+    $$PWD/fixit.cpp \
+    $$PWD/highlightingmark.cpp \
+    $$PWD/highlightingmarks.cpp \
+    $$PWD/projectpart.cpp \
+    $$PWD/projects.cpp \
+    $$PWD/skippedsourceranges.cpp \
+    $$PWD/sourcelocation.cpp \
+    $$PWD/sourcerange.cpp \
+    $$PWD/unsavedfile.cpp \
+    $$PWD/unsavedfiles.cpp \
+    $$PWD/utf8positionfromlinecolumn.cpp \