diff --git a/src/libs/clangsupport/cancelmessage.h b/src/libs/clangsupport/cancelmessage.h
index 151799c3ab4..eae144410be 100644
--- a/src/libs/clangsupport/cancelmessage.h
+++ b/src/libs/clangsupport/cancelmessage.h
@@ -48,7 +48,7 @@ public:
     }
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CancelMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CancelMessage &message);
 std::ostream &operator<<(std::ostream &os, const CancelMessage &message);
 
 DECLARE_MESSAGE(CancelMessage)
diff --git a/src/libs/clangsupport/clangcodemodelclientinterface.h b/src/libs/clangsupport/clangcodemodelclientinterface.h
index 3577abb1543..b6b878baaf0 100644
--- a/src/libs/clangsupport/clangcodemodelclientinterface.h
+++ b/src/libs/clangsupport/clangcodemodelclientinterface.h
@@ -49,7 +49,7 @@ class UnregisterUnsavedFilesForEditorMessage;
 class UpdateTranslationUnitsForEditorMessage;
 class UpdateVisibleTranslationUnitsMessage;
 
-class CMBIPC_EXPORT ClangCodeModelClientInterface : public IpcClientInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelClientInterface : public IpcClientInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;
diff --git a/src/libs/clangsupport/clangcodemodelclientproxy.h b/src/libs/clangsupport/clangcodemodelclientproxy.h
index 91cf900eb46..0665d6e8faa 100644
--- a/src/libs/clangsupport/clangcodemodelclientproxy.h
+++ b/src/libs/clangsupport/clangcodemodelclientproxy.h
@@ -41,7 +41,7 @@ QT_END_NAMESPACE
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT ClangCodeModelClientProxy : public ClangCodeModelClientInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelClientProxy : public ClangCodeModelClientInterface
 {
 public:
     explicit ClangCodeModelClientProxy(ClangCodeModelServerInterface *server, QIODevice *ioDevice);
diff --git a/src/libs/clangsupport/clangcodemodelconnectionclient.h b/src/libs/clangsupport/clangcodemodelconnectionclient.h
index 4069d654bdf..b9fdbdffc76 100644
--- a/src/libs/clangsupport/clangcodemodelconnectionclient.h
+++ b/src/libs/clangsupport/clangcodemodelconnectionclient.h
@@ -29,7 +29,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT ClangCodeModelConnectionClient : public ConnectionClient
+class CLANGSUPPORT_EXPORT ClangCodeModelConnectionClient : public ConnectionClient
 {
 public:
     ClangCodeModelConnectionClient(ClangCodeModelClientInterface *client);
diff --git a/src/libs/clangsupport/clangcodemodelserverinterface.h b/src/libs/clangsupport/clangcodemodelserverinterface.h
index e5b2956eddf..e4e897afc4d 100644
--- a/src/libs/clangsupport/clangcodemodelserverinterface.h
+++ b/src/libs/clangsupport/clangcodemodelserverinterface.h
@@ -33,7 +33,7 @@ namespace ClangBackEnd {
 
 class ClangCodeModelClientInterface;
 
-class CMBIPC_EXPORT ClangCodeModelServerInterface : public IpcServerInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelServerInterface : public IpcServerInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;
diff --git a/src/libs/clangsupport/clangcodemodelserverproxy.h b/src/libs/clangsupport/clangcodemodelserverproxy.h
index c43c9cd01d6..88badf55509 100644
--- a/src/libs/clangsupport/clangcodemodelserverproxy.h
+++ b/src/libs/clangsupport/clangcodemodelserverproxy.h
@@ -42,7 +42,7 @@ QT_END_NAMESPACE
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT ClangCodeModelServerProxy : public ClangCodeModelServerInterface
+class CLANGSUPPORT_EXPORT ClangCodeModelServerProxy : public ClangCodeModelServerInterface
 {
 public:
     ClangCodeModelServerProxy(ClangCodeModelClientInterface *client, QIODevice *ioDevice);
diff --git a/src/libs/clangsupport/clangsupport_global.h b/src/libs/clangsupport/clangsupport_global.h
index f69b11b7d2e..abf57b1f8e8 100644
--- a/src/libs/clangsupport/clangsupport_global.h
+++ b/src/libs/clangsupport/clangsupport_global.h
@@ -36,11 +36,11 @@
 #endif
 
 #if defined(CLANGSUPPORT_BUILD_LIB)
-#  define CMBIPC_EXPORT Q_DECL_EXPORT
+#  define CLANGSUPPORT_EXPORT Q_DECL_EXPORT
 #elif defined(CLANGSUPPORT_BUILD_STATIC_LIB)
-#  define CMBIPC_EXPORT
+#  define CLANGSUPPORT_EXPORT
 #else
-#  define CMBIPC_EXPORT Q_DECL_IMPORT
+#  define CLANGSUPPORT_EXPORT Q_DECL_IMPORT
 #endif
 
 #ifndef CLANGBACKENDPROCESSPATH
diff --git a/src/libs/clangsupport/clangsupportdebugutils.h b/src/libs/clangsupport/clangsupportdebugutils.h
index 52352bb315d..5f1751aeac7 100644
--- a/src/libs/clangsupport/clangsupportdebugutils.h
+++ b/src/libs/clangsupport/clangsupportdebugutils.h
@@ -37,7 +37,7 @@ namespace ClangBackEnd {
 Utf8String debugWriteFileForInspection(const Utf8String &fileContent, const Utf8String &id);
 Utf8String debugId(const FileContainer &fileContainer);
 
-class CMBIPC_EXPORT VerboseScopeDurationTimer
+class CLANGSUPPORT_EXPORT VerboseScopeDurationTimer
 {
 public:
     VerboseScopeDurationTimer(const char *id = 0);
diff --git a/src/libs/clangsupport/cmbalivemessage.h b/src/libs/clangsupport/cmbalivemessage.h
index 6093b4b86bf..9050f5e8064 100644
--- a/src/libs/clangsupport/cmbalivemessage.h
+++ b/src/libs/clangsupport/cmbalivemessage.h
@@ -52,7 +52,7 @@ public:
     }
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const AliveMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const AliveMessage &message);
 std::ostream &operator<<(std::ostream &os, const AliveMessage &message);
 
 DECLARE_MESSAGE(AliveMessage)
diff --git a/src/libs/clangsupport/cmbcodecompletedmessage.h b/src/libs/clangsupport/cmbcodecompletedmessage.h
index 1bcac526ca5..e7759953e6e 100644
--- a/src/libs/clangsupport/cmbcodecompletedmessage.h
+++ b/src/libs/clangsupport/cmbcodecompletedmessage.h
@@ -90,7 +90,7 @@ public:
             && first.m_codeCompletions == second.m_codeCompletions;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletedMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const CodeCompletedMessage &message);
 
 private:
diff --git a/src/libs/clangsupport/cmbcompletecodemessage.h b/src/libs/clangsupport/cmbcompletecodemessage.h
index 423d711d456..bf604402c91 100644
--- a/src/libs/clangsupport/cmbcompletecodemessage.h
+++ b/src/libs/clangsupport/cmbcompletecodemessage.h
@@ -126,13 +126,13 @@ public:
                 && first.m_funcNameStartColumn == second.m_funcNameStartColumn;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CompleteCodeMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const CompleteCodeMessage &message);
 
 private:
     Utf8String m_filePath;
     Utf8String m_projectPartId;
-    static CMBIPC_EXPORT quint64 ticketCounter;
+    static CLANGSUPPORT_EXPORT quint64 ticketCounter;
     quint64 m_ticketNumber = 0;
     quint32 m_line = 0;
     quint32 m_column = 0;
diff --git a/src/libs/clangsupport/cmbechomessage.h b/src/libs/clangsupport/cmbechomessage.h
index 7e75a35e3a6..f9d81836704 100644
--- a/src/libs/clangsupport/cmbechomessage.h
+++ b/src/libs/clangsupport/cmbechomessage.h
@@ -70,7 +70,7 @@ private:
     MessageEnvelop m_message;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EchoMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const EchoMessage &message);
 std::ostream &operator<<(std::ostream &os, const EchoMessage &message);
 
 DECLARE_MESSAGE(EchoMessage)
diff --git a/src/libs/clangsupport/cmbendmessage.h b/src/libs/clangsupport/cmbendmessage.h
index 40db9ef51fc..1db2e176433 100644
--- a/src/libs/clangsupport/cmbendmessage.h
+++ b/src/libs/clangsupport/cmbendmessage.h
@@ -52,7 +52,7 @@ public:
     }
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const EndMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const EndMessage &message);
 std::ostream &operator<<(std::ostream &os, const EndMessage &message);
 
 DECLARE_MESSAGE(EndMessage)
diff --git a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h
index 10880735f7a..5f62150da61 100644
--- a/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h
+++ b/src/libs/clangsupport/cmbregisterprojectsforeditormessage.h
@@ -69,7 +69,7 @@ private:
     QVector<ProjectPartContainer> m_projectContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterProjectPartsForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const RegisterProjectPartsForEditorMessage &message);
 
 DECLARE_MESSAGE(RegisterProjectPartsForEditorMessage);
diff --git a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h
index 85afdf63f9f..dd1e29065dc 100644
--- a/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/cmbregistertranslationunitsforeditormessage.h
@@ -91,7 +91,7 @@ private:
     Utf8StringVector visibleEditorFilePaths_;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterTranslationUnitForEditorMessage &message);
 
 DECLARE_MESSAGE(RegisterTranslationUnitForEditorMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h
index 8f1e02f2fe5..4db038a1f4d 100644
--- a/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h
+++ b/src/libs/clangsupport/cmbunregisterprojectsforeditormessage.h
@@ -33,7 +33,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT UnregisterProjectPartsForEditorMessage
+class CLANGSUPPORT_EXPORT UnregisterProjectPartsForEditorMessage
 {
 public:
     UnregisterProjectPartsForEditorMessage() = default;
@@ -70,7 +70,7 @@ private:
     Utf8StringVector m_projectPartIds;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterProjectPartsForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const UnregisterProjectPartsForEditorMessage &message);
 
 DECLARE_MESSAGE(UnregisterProjectPartsForEditorMessage);
diff --git a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h
index aa6bf47edd3..f9eb65c9abf 100644
--- a/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/cmbunregistertranslationunitsforeditormessage.h
@@ -72,7 +72,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterTranslationUnitsForEditorMessage &message);
 
 DECLARE_MESSAGE(UnregisterTranslationUnitsForEditorMessage);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/codecompletion.h b/src/libs/clangsupport/codecompletion.h
index 78303c1c33f..003b7c574a0 100644
--- a/src/libs/clangsupport/codecompletion.h
+++ b/src/libs/clangsupport/codecompletion.h
@@ -193,7 +193,7 @@ public:
                 && first.m_completionKind == second.m_completionKind;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletion &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletion &message);
     friend std::ostream &operator<<(std::ostream &os, const CodeCompletion &message);
 
 private:
@@ -206,8 +206,8 @@ private:
     bool m_hasParameters = false;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, CodeCompletion::Kind kind);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, CodeCompletion::Kind kind);
 
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Kind kind);
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Availability availability);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Kind kind);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, const CodeCompletion::Availability availability);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/codecompletionchunk.h b/src/libs/clangsupport/codecompletionchunk.h
index 57d351afde5..0d7c043e58c 100644
--- a/src/libs/clangsupport/codecompletionchunk.h
+++ b/src/libs/clangsupport/codecompletionchunk.h
@@ -125,7 +125,7 @@ private:
     bool m_isOptional = false;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const CodeCompletionChunk &chunk);
 
 std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk &chunk);
 std::ostream &operator<<(std::ostream &os, const CodeCompletionChunk::Kind &kind);
diff --git a/src/libs/clangsupport/connectionclient.h b/src/libs/clangsupport/connectionclient.h
index d8c6692b569..cfa7a67b2f2 100644
--- a/src/libs/clangsupport/connectionclient.h
+++ b/src/libs/clangsupport/connectionclient.h
@@ -48,7 +48,7 @@ namespace ClangBackEnd {
 
 class FileContainer;
 
-class CMBIPC_EXPORT ConnectionClient : public QObject
+class CLANGSUPPORT_EXPORT ConnectionClient : public QObject
 {
     Q_OBJECT
 
diff --git a/src/libs/clangsupport/connectionserver.h b/src/libs/clangsupport/connectionserver.h
index 268c3776a43..715a2b9caa7 100644
--- a/src/libs/clangsupport/connectionserver.h
+++ b/src/libs/clangsupport/connectionserver.h
@@ -41,7 +41,7 @@ namespace ClangBackEnd {
 class ClangCodeModelServerInterface;
 class ClangCodeModelClientProxy;
 
-struct CMBIPC_EXPORT ConnectionName {
+struct CLANGSUPPORT_EXPORT ConnectionName {
     static QString connectionName;
 };
 
diff --git a/src/libs/clangsupport/diagnosticcontainer.h b/src/libs/clangsupport/diagnosticcontainer.h
index 56f45abee3a..cff34d5f9f6 100644
--- a/src/libs/clangsupport/diagnosticcontainer.h
+++ b/src/libs/clangsupport/diagnosticcontainer.h
@@ -161,7 +161,7 @@ private:
     DiagnosticSeverity m_severity = DiagnosticSeverity::Ignored;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DiagnosticContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DiagnosticContainer &container);
 std::ostream &operator<<(std::ostream &os, const DiagnosticContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/documentannotationschangedmessage.h b/src/libs/clangsupport/documentannotationschangedmessage.h
index 63fbdcd902e..370fd4d66fb 100644
--- a/src/libs/clangsupport/documentannotationschangedmessage.h
+++ b/src/libs/clangsupport/documentannotationschangedmessage.h
@@ -35,7 +35,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT DocumentAnnotationsChangedMessage
+class CLANGSUPPORT_EXPORT DocumentAnnotationsChangedMessage
 {
 public:
     DocumentAnnotationsChangedMessage() = default;
@@ -117,7 +117,7 @@ private:
     QVector<SourceRangeContainer> m_skippedPreprocessorRanges;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DocumentAnnotationsChangedMessage &message);
 std::ostream &operator<<(std::ostream &os, const DocumentAnnotationsChangedMessage &message);
 
 DECLARE_MESSAGE(DocumentAnnotationsChangedMessage)
diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h
index 09149ea35dd..1daf050e914 100644
--- a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontainer.h
@@ -98,7 +98,7 @@ private:
 
 using DynamicASTMatcherDiagnosticContainers = std::vector<DynamicASTMatcherDiagnosticContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContainer &container);
 std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h
index c220aa23777..2cb5ec24176 100644
--- a/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticcontextcontainer.h
@@ -55,7 +55,7 @@ public:
         return m_contextType;
     }
 
-    CMBIPC_EXPORT Utils::SmallString contextTypeText() const;
+    CLANGSUPPORT_EXPORT Utils::SmallString contextTypeText() const;
 
     const Utils::SmallStringVector &arguments() const
     {
@@ -107,7 +107,7 @@ private:
 
 using DynamicASTMatcherDiagnosticContextContainers = std::vector<DynamicASTMatcherDiagnosticContextContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticContextContainer &container);
 std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticContextContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h
index 07a21af605f..319a9cf46b6 100644
--- a/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h
+++ b/src/libs/clangsupport/dynamicastmatcherdiagnosticmessagecontainer.h
@@ -55,7 +55,7 @@ public:
         return m_errorType;
     }
 
-    CMBIPC_EXPORT Utils::SmallString errorTypeText() const;
+    CLANGSUPPORT_EXPORT Utils::SmallString errorTypeText() const;
 
     const Utils::SmallStringVector &arguments() const
     {
@@ -107,7 +107,7 @@ private:
 
 using DynamicASTMatcherDiagnosticMessageContainers = std::vector<DynamicASTMatcherDiagnosticMessageContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const DynamicASTMatcherDiagnosticMessageContainer &container);
 std::ostream &operator<<(std::ostream &os, const DynamicASTMatcherDiagnosticMessageContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/filecontainer.h b/src/libs/clangsupport/filecontainer.h
index 0a45c491d2f..30565bceaa0 100644
--- a/src/libs/clangsupport/filecontainer.h
+++ b/src/libs/clangsupport/filecontainer.h
@@ -146,7 +146,7 @@ private:
     bool m_hasUnsavedFileContent = false;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
 std::ostream &operator<<(std::ostream &os, const FileContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/filecontainerv2.h b/src/libs/clangsupport/filecontainerv2.h
index 7832a43c392..00b9eb7c107 100644
--- a/src/libs/clangsupport/filecontainerv2.h
+++ b/src/libs/clangsupport/filecontainerv2.h
@@ -129,7 +129,7 @@ private:
 
 using FileContainers = std::vector<FileContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FileContainer &container);
 std::ostream &operator<<(std::ostream &os, const FileContainer &container);
 
 } // namespace V2
diff --git a/src/libs/clangsupport/filepath.h b/src/libs/clangsupport/filepath.h
index c57da408bc0..0466bbfe7a4 100644
--- a/src/libs/clangsupport/filepath.h
+++ b/src/libs/clangsupport/filepath.h
@@ -130,6 +130,6 @@ private:
     std::size_t m_slashIndex = 0;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FilePath &filePath);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FilePath &filePath);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/fixitcontainer.h b/src/libs/clangsupport/fixitcontainer.h
index eac27da02f0..cbaafbef36e 100644
--- a/src/libs/clangsupport/fixitcontainer.h
+++ b/src/libs/clangsupport/fixitcontainer.h
@@ -78,7 +78,7 @@ private:
     Utf8String m_text;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FixItContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FixItContainer &container);
 std::ostream &operator<<(std::ostream &os, const FixItContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/followsymbolmessage.h b/src/libs/clangsupport/followsymbolmessage.h
index 3893a6e49c3..9ad70d3c892 100644
--- a/src/libs/clangsupport/followsymbolmessage.h
+++ b/src/libs/clangsupport/followsymbolmessage.h
@@ -83,7 +83,7 @@ public:
                 && first.m_sourceRange == second.m_sourceRange;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const FollowSymbolMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const FollowSymbolMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const FollowSymbolMessage &message);
 private:
     FileContainer m_fileContainer;
diff --git a/src/libs/clangsupport/highlightingmarkcontainer.h b/src/libs/clangsupport/highlightingmarkcontainer.h
index 8b6e585e501..07bd27ca8a9 100644
--- a/src/libs/clangsupport/highlightingmarkcontainer.h
+++ b/src/libs/clangsupport/highlightingmarkcontainer.h
@@ -200,9 +200,9 @@ inline bool operator==(const HighlightingTypes &first, const HighlightingTypes &
         && first.mixinHighlightingTypes == second.mixinHighlightingTypes;
 }
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const HighlightingMarkContainer &container);
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType);
-CMBIPC_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingTypes types);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const HighlightingMarkContainer &container);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingType highlightingType);
+CLANGSUPPORT_EXPORT std::ostream &operator<<(std::ostream &os, HighlightingTypes types);
 std::ostream &operator<<(std::ostream &os, const HighlightingMarkContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/ipcclientinterface.h b/src/libs/clangsupport/ipcclientinterface.h
index 080de8a2075..8bd4e2cfee8 100644
--- a/src/libs/clangsupport/ipcclientinterface.h
+++ b/src/libs/clangsupport/ipcclientinterface.h
@@ -29,7 +29,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT IpcClientInterface : public IpcInterface
+class CLANGSUPPORT_EXPORT IpcClientInterface : public IpcInterface
 {
 public:
     IpcClientInterface();
diff --git a/src/libs/clangsupport/ipcinterface.h b/src/libs/clangsupport/ipcinterface.h
index 25ebeb650fe..333c2ee873c 100644
--- a/src/libs/clangsupport/ipcinterface.h
+++ b/src/libs/clangsupport/ipcinterface.h
@@ -33,7 +33,7 @@ namespace ClangBackEnd {
 
 class MessageEnvelop;
 
-class CMBIPC_EXPORT IpcInterface
+class CLANGSUPPORT_EXPORT IpcInterface
 {
 public:
     virtual ~IpcInterface();
diff --git a/src/libs/clangsupport/lineprefixer.h b/src/libs/clangsupport/lineprefixer.h
index de87e4b10d0..58439875fa4 100644
--- a/src/libs/clangsupport/lineprefixer.h
+++ b/src/libs/clangsupport/lineprefixer.h
@@ -33,7 +33,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT LinePrefixer
+class CLANGSUPPORT_EXPORT LinePrefixer
 {
 public:
     LinePrefixer() = default;
diff --git a/src/libs/clangsupport/pchmanagerclientinterface.h b/src/libs/clangsupport/pchmanagerclientinterface.h
index 771951641a0..892462a6663 100644
--- a/src/libs/clangsupport/pchmanagerclientinterface.h
+++ b/src/libs/clangsupport/pchmanagerclientinterface.h
@@ -31,7 +31,7 @@ namespace ClangBackEnd {
 
 class PrecompiledHeadersUpdatedMessage;
 
-class CMBIPC_EXPORT PchManagerClientInterface : public IpcClientInterface
+class CLANGSUPPORT_EXPORT PchManagerClientInterface : public IpcClientInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;
diff --git a/src/libs/clangsupport/pchmanagerclientproxy.h b/src/libs/clangsupport/pchmanagerclientproxy.h
index 71361881e9a..ff363fbb987 100644
--- a/src/libs/clangsupport/pchmanagerclientproxy.h
+++ b/src/libs/clangsupport/pchmanagerclientproxy.h
@@ -34,7 +34,7 @@ namespace ClangBackEnd {
 
 class PchManagerServerInterface;
 
-class CMBIPC_EXPORT PchManagerClientProxy : public PchManagerClientInterface
+class CLANGSUPPORT_EXPORT PchManagerClientProxy : public PchManagerClientInterface
 {
 public:
     explicit PchManagerClientProxy(PchManagerServerInterface *server, QIODevice *ioDevice);
diff --git a/src/libs/clangsupport/pchmanagerserverinterface.h b/src/libs/clangsupport/pchmanagerserverinterface.h
index 6af04c91fed..2f406f365a1 100644
--- a/src/libs/clangsupport/pchmanagerserverinterface.h
+++ b/src/libs/clangsupport/pchmanagerserverinterface.h
@@ -35,7 +35,7 @@ class PchManagerClientInterface;
 class RemovePchProjectPartsMessage;
 class UpdatePchProjectPartsMessage;
 
-class CMBIPC_EXPORT PchManagerServerInterface : public ProjectManagementServerInterface
+class CLANGSUPPORT_EXPORT PchManagerServerInterface : public ProjectManagementServerInterface
 {
 public:
     void dispatch(const MessageEnvelop &messageEnvelop) override;
diff --git a/src/libs/clangsupport/pchmanagerserverproxy.h b/src/libs/clangsupport/pchmanagerserverproxy.h
index 6b7c212934c..300d439278f 100644
--- a/src/libs/clangsupport/pchmanagerserverproxy.h
+++ b/src/libs/clangsupport/pchmanagerserverproxy.h
@@ -42,7 +42,7 @@ namespace ClangBackEnd {
 
 class PchManagerClientInterface;
 
-class CMBIPC_EXPORT PchManagerServerProxy final : public PchManagerServerInterface
+class CLANGSUPPORT_EXPORT PchManagerServerProxy final : public PchManagerServerInterface
 {
 public:
     explicit PchManagerServerProxy(PchManagerClientInterface *client, QIODevice *ioDevice);
diff --git a/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp b/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp
index 38c56be38b5..584dad3bbeb 100644
--- a/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp
+++ b/src/libs/clangsupport/precompiledheadersupdatedmessage.cpp
@@ -29,7 +29,7 @@
 
 namespace ClangBackEnd {
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &)
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &)
 {
     debug.nospace() << "PrecompiledHeaderUpdatedMessage()";
 
diff --git a/src/libs/clangsupport/precompiledheadersupdatedmessage.h b/src/libs/clangsupport/precompiledheadersupdatedmessage.h
index e4fdcda0112..b2c60dce122 100644
--- a/src/libs/clangsupport/precompiledheadersupdatedmessage.h
+++ b/src/libs/clangsupport/precompiledheadersupdatedmessage.h
@@ -71,7 +71,7 @@ private:
     std::vector<ProjectPartPch> m_projectPartPchs;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const PrecompiledHeadersUpdatedMessage &message);
 std::ostream &operator<<(std::ostream &out, const PrecompiledHeadersUpdatedMessage &message);
 
 DECLARE_MESSAGE(PrecompiledHeadersUpdatedMessage)
diff --git a/src/libs/clangsupport/projectmanagementserverinterface.h b/src/libs/clangsupport/projectmanagementserverinterface.h
index 5704db417c0..5ccef00451c 100644
--- a/src/libs/clangsupport/projectmanagementserverinterface.h
+++ b/src/libs/clangsupport/projectmanagementserverinterface.h
@@ -32,7 +32,7 @@ namespace ClangBackEnd {
 class RemovePchProjectPartsMessage;
 class UpdatePchProjectPartsMessage;
 
-class CMBIPC_EXPORT ProjectManagementServerInterface : public IpcInterface
+class CLANGSUPPORT_EXPORT ProjectManagementServerInterface : public IpcInterface
 {
 public:
     virtual void updatePchProjectParts(UpdatePchProjectPartsMessage &&message) = 0;
diff --git a/src/libs/clangsupport/projectpartpch.h b/src/libs/clangsupport/projectpartpch.h
index 5ddbca57a0a..1b1b06a6102 100644
--- a/src/libs/clangsupport/projectpartpch.h
+++ b/src/libs/clangsupport/projectpartpch.h
@@ -83,6 +83,6 @@ private:
     Utils::SmallString m_pchPath;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const ProjectPartPch &projectPartPch);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ProjectPartPch &projectPartPch);
 std::ostream &operator<<(std::ostream &out, const ProjectPartPch &projectPartPch);
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/refactoringclientinterface.h b/src/libs/clangsupport/refactoringclientinterface.h
index 8f109869296..1b7f145b901 100644
--- a/src/libs/clangsupport/refactoringclientinterface.h
+++ b/src/libs/clangsupport/refactoringclientinterface.h
@@ -36,7 +36,7 @@ class SourceRangesAndDiagnosticsForQueryMessage;
 class SourceRangesForQueryMessage;
 class SourceLocationsContainer;
 
-class CMBIPC_EXPORT RefactoringClientInterface : public IpcClientInterface
+class CLANGSUPPORT_EXPORT RefactoringClientInterface : public IpcClientInterface
 {
 public:
     using RenameCallback = std::function<void(const QString &,
diff --git a/src/libs/clangsupport/refactoringclientproxy.h b/src/libs/clangsupport/refactoringclientproxy.h
index 482fde8b1fd..0feb4589581 100644
--- a/src/libs/clangsupport/refactoringclientproxy.h
+++ b/src/libs/clangsupport/refactoringclientproxy.h
@@ -36,7 +36,7 @@ namespace ClangBackEnd {
 
 class RefactoringServerInterface;
 
-class CMBIPC_EXPORT RefactoringClientProxy : public RefactoringClientInterface
+class CLANGSUPPORT_EXPORT RefactoringClientProxy : public RefactoringClientInterface
 {
 public:
     explicit RefactoringClientProxy(RefactoringServerInterface *server, QIODevice *ioDevice);
diff --git a/src/libs/clangsupport/refactoringserverinterface.h b/src/libs/clangsupport/refactoringserverinterface.h
index a4a3b1e6f4a..72bbad4d73e 100644
--- a/src/libs/clangsupport/refactoringserverinterface.h
+++ b/src/libs/clangsupport/refactoringserverinterface.h
@@ -39,7 +39,7 @@ class CancelMessage;
 class UpdatePchProjectPartsMessage;
 class RemovePchProjectPartsMessage;
 
-class CMBIPC_EXPORT RefactoringServerInterface : public ProjectManagementServerInterface
+class CLANGSUPPORT_EXPORT RefactoringServerInterface : public ProjectManagementServerInterface
 
 {
 public:
diff --git a/src/libs/clangsupport/refactoringserverproxy.h b/src/libs/clangsupport/refactoringserverproxy.h
index 611155b5110..cfe21938495 100644
--- a/src/libs/clangsupport/refactoringserverproxy.h
+++ b/src/libs/clangsupport/refactoringserverproxy.h
@@ -42,7 +42,7 @@ namespace ClangBackEnd {
 
 class RefactoringClientInterface;
 
-class CMBIPC_EXPORT RefactoringServerProxy final : public RefactoringServerInterface
+class CLANGSUPPORT_EXPORT RefactoringServerProxy final : public RefactoringServerInterface
 {
 public:
     explicit RefactoringServerProxy(RefactoringClientInterface *client, QIODevice *ioDevice);
diff --git a/src/libs/clangsupport/referencesmessage.h b/src/libs/clangsupport/referencesmessage.h
index 5d0b4d292a1..efdcf2b08f0 100644
--- a/src/libs/clangsupport/referencesmessage.h
+++ b/src/libs/clangsupport/referencesmessage.h
@@ -96,7 +96,7 @@ public:
             && first.m_references == second.m_references;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const ReferencesMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const ReferencesMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const ReferencesMessage &message);
 
 private:
diff --git a/src/libs/clangsupport/registerunsavedfilesforeditormessage.h b/src/libs/clangsupport/registerunsavedfilesforeditormessage.h
index 973fe9294fd..826bdd4e89c 100644
--- a/src/libs/clangsupport/registerunsavedfilesforeditormessage.h
+++ b/src/libs/clangsupport/registerunsavedfilesforeditormessage.h
@@ -68,7 +68,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RegisterUnsavedFilesForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const RegisterUnsavedFilesForEditorMessage &message);
 
 DECLARE_MESSAGE(RegisterUnsavedFilesForEditorMessage);
diff --git a/src/libs/clangsupport/removepchprojectpartsmessage.cpp b/src/libs/clangsupport/removepchprojectpartsmessage.cpp
index 24c657336ac..d83dfac39b6 100644
--- a/src/libs/clangsupport/removepchprojectpartsmessage.cpp
+++ b/src/libs/clangsupport/removepchprojectpartsmessage.cpp
@@ -27,7 +27,7 @@
 
 namespace ClangBackEnd {
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message)
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message)
 {
     debug.nospace() << "RemoveProjectPartsMessage("
                     << message.projectsPartIds() << ")";
diff --git a/src/libs/clangsupport/removepchprojectpartsmessage.h b/src/libs/clangsupport/removepchprojectpartsmessage.h
index c6ae105dd0b..ca718e55d17 100644
--- a/src/libs/clangsupport/removepchprojectpartsmessage.h
+++ b/src/libs/clangsupport/removepchprojectpartsmessage.h
@@ -76,7 +76,7 @@ private:
     Utils::SmallStringVector m_projectsPartIds;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RemovePchProjectPartsMessage &message);
 std::ostream &operator<<(std::ostream &out, const RemovePchProjectPartsMessage &message);
 
 DECLARE_MESSAGE(RemovePchProjectPartsMessage)
diff --git a/src/libs/clangsupport/requestdocumentannotations.h b/src/libs/clangsupport/requestdocumentannotations.h
index e8facfef332..56717f6a389 100644
--- a/src/libs/clangsupport/requestdocumentannotations.h
+++ b/src/libs/clangsupport/requestdocumentannotations.h
@@ -66,7 +66,7 @@ private:
     FileContainer m_fileContainer;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestDocumentAnnotationsMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestDocumentAnnotationsMessage &message);
 
 DECLARE_MESSAGE(RequestDocumentAnnotationsMessage);
diff --git a/src/libs/clangsupport/requestfollowsymbolmessage.h b/src/libs/clangsupport/requestfollowsymbolmessage.h
index 1305abfba81..25a8fb2b9d2 100644
--- a/src/libs/clangsupport/requestfollowsymbolmessage.h
+++ b/src/libs/clangsupport/requestfollowsymbolmessage.h
@@ -106,7 +106,7 @@ public:
             && first.m_dependentFiles == second.m_dependentFiles;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestFollowSymbolMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestFollowSymbolMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const RequestFollowSymbolMessage &message);
 private:
     FileContainer m_fileContainer;
@@ -114,7 +114,7 @@ private:
     quint32 m_line = 0;
     quint32 m_column = 0;
     QVector<Utf8String> m_dependentFiles;
-    static CMBIPC_EXPORT quint64 ticketCounter;
+    static CLANGSUPPORT_EXPORT quint64 ticketCounter;
 };
 
 DECLARE_MESSAGE(RequestFollowSymbolMessage);
diff --git a/src/libs/clangsupport/requestreferencesmessage.h b/src/libs/clangsupport/requestreferencesmessage.h
index 8757799d206..fbbd934c43a 100644
--- a/src/libs/clangsupport/requestreferencesmessage.h
+++ b/src/libs/clangsupport/requestreferencesmessage.h
@@ -96,7 +96,7 @@ public:
             && first.m_fileContainer == second.m_fileContainer;
     }
 
-    friend CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestReferencesMessage &message);
+    friend CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestReferencesMessage &message);
     friend std::ostream &operator<<(std::ostream &os, const RequestReferencesMessage &message);
 
 private:
@@ -104,7 +104,7 @@ private:
     quint64 m_ticketNumber = 0;
     quint32 m_line = 0;
     quint32 m_column = 0;
-    static CMBIPC_EXPORT quint64 ticketCounter;
+    static CLANGSUPPORT_EXPORT quint64 ticketCounter;
 };
 
 DECLARE_MESSAGE(RequestReferencesMessage);
diff --git a/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h
index 271202cda3c..c79165ef88f 100644
--- a/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h
+++ b/src/libs/clangsupport/requestsourcelocationforrenamingmessage.h
@@ -32,7 +32,7 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT RequestSourceLocationsForRenamingMessage
+class CLANGSUPPORT_EXPORT RequestSourceLocationsForRenamingMessage
 {
 public:
     RequestSourceLocationsForRenamingMessage() = default;
@@ -132,7 +132,7 @@ private:
     int m_revision = 1;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceLocationsForRenamingMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestSourceLocationsForRenamingMessage &message);
 
 DECLARE_MESSAGE(RequestSourceLocationsForRenamingMessage)
diff --git a/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h
index afac9e9b6b3..fc39ae16dc7 100644
--- a/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h
+++ b/src/libs/clangsupport/requestsourcerangesanddiagnosticsforquerymessage.h
@@ -93,7 +93,7 @@ private:
     V2::FileContainer m_source;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesAndDiagnosticsForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestSourceRangesAndDiagnosticsForQueryMessage &message);
 
 DECLARE_MESSAGE(RequestSourceRangesAndDiagnosticsForQueryMessage)
diff --git a/src/libs/clangsupport/requestsourcerangesforquerymessage.h b/src/libs/clangsupport/requestsourcerangesforquerymessage.h
index 1dc3ca6ac52..095849ee5c4 100644
--- a/src/libs/clangsupport/requestsourcerangesforquerymessage.h
+++ b/src/libs/clangsupport/requestsourcerangesforquerymessage.h
@@ -110,7 +110,7 @@ private:
 };
 
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const RequestSourceRangesForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const RequestSourceRangesForQueryMessage &message);
 
 DECLARE_MESSAGE(RequestSourceRangesForQueryMessage)
diff --git a/src/libs/clangsupport/sourcelocationcontainer.h b/src/libs/clangsupport/sourcelocationcontainer.h
index 80971e8ee8f..f71ee92bbd9 100644
--- a/src/libs/clangsupport/sourcelocationcontainer.h
+++ b/src/libs/clangsupport/sourcelocationcontainer.h
@@ -31,12 +31,12 @@
 
 namespace ClangBackEnd {
 
-class CMBIPC_EXPORT SourceLocationContainer
+class CLANGSUPPORT_EXPORT SourceLocationContainer
 {
-    friend CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
-    friend CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
-    friend CMBIPC_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
-    friend CMBIPC_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
+    friend CLANGSUPPORT_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
+    friend CLANGSUPPORT_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
+    friend CLANGSUPPORT_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
+    friend CLANGSUPPORT_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
 public:
     SourceLocationContainer() = default;
     SourceLocationContainer(const Utf8String &filePath,
@@ -53,12 +53,12 @@ private:
     uint m_column = 0;
 };
 
-CMBIPC_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
-CMBIPC_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
-CMBIPC_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
-CMBIPC_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
+CLANGSUPPORT_EXPORT QDataStream &operator<<(QDataStream &out, const SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT QDataStream &operator>>(QDataStream &in, SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT bool operator==(const SourceLocationContainer &first, const SourceLocationContainer &second);
+CLANGSUPPORT_EXPORT bool operator!=(const SourceLocationContainer &first, const SourceLocationContainer &second);
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/sourcelocationcontainerv2.h b/src/libs/clangsupport/sourcelocationcontainerv2.h
index def1c389fa2..c68f7e22be0 100644
--- a/src/libs/clangsupport/sourcelocationcontainerv2.h
+++ b/src/libs/clangsupport/sourcelocationcontainerv2.h
@@ -119,7 +119,7 @@ private:
     uint m_offset = 0;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceLocationContainer &container);
 
 } // namespace V2
diff --git a/src/libs/clangsupport/sourcelocationscontainer.h b/src/libs/clangsupport/sourcelocationscontainer.h
index 731ad16906b..49a6ffac33a 100644
--- a/src/libs/clangsupport/sourcelocationscontainer.h
+++ b/src/libs/clangsupport/sourcelocationscontainer.h
@@ -100,7 +100,7 @@ public:
 };
 
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceLocationsContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/sourcelocationsforrenamingmessage.h b/src/libs/clangsupport/sourcelocationsforrenamingmessage.h
index 5362ed2e46b..5605ab56d6f 100644
--- a/src/libs/clangsupport/sourcelocationsforrenamingmessage.h
+++ b/src/libs/clangsupport/sourcelocationsforrenamingmessage.h
@@ -96,7 +96,7 @@ private:
     int m_revision = 0;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceLocationsForRenamingMessage &message);
 std::ostream &operator<<(std::ostream &os, const SourceLocationsForRenamingMessage &message);
 
 DECLARE_MESSAGE(SourceLocationsForRenamingMessage)
diff --git a/src/libs/clangsupport/sourcerangecontainer.h b/src/libs/clangsupport/sourcerangecontainer.h
index ff871cf8edb..48eb3ffdea1 100644
--- a/src/libs/clangsupport/sourcerangecontainer.h
+++ b/src/libs/clangsupport/sourcerangecontainer.h
@@ -79,7 +79,7 @@ private:
 
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/sourcerangecontainerv2.h b/src/libs/clangsupport/sourcerangecontainerv2.h
index a5dba3ddf15..605de5c2b3e 100644
--- a/src/libs/clangsupport/sourcerangecontainerv2.h
+++ b/src/libs/clangsupport/sourcerangecontainerv2.h
@@ -109,7 +109,7 @@ private:
 
 using SourceRangeContainers = std::vector<SourceRangeContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangeContainer &container);
 } // namespace V2
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h
index f91db432f60..c1cdae42fae 100644
--- a/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h
+++ b/src/libs/clangsupport/sourcerangesanddiagnosticsforquerymessage.h
@@ -95,7 +95,7 @@ private:
     DynamicASTMatcherDiagnosticContainers m_diagnosticContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesAndDiagnosticsForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const SourceRangesAndDiagnosticsForQueryMessage &message);
 
 DECLARE_MESSAGE(SourceRangesAndDiagnosticsForQueryMessage)
diff --git a/src/libs/clangsupport/sourcerangescontainer.h b/src/libs/clangsupport/sourcerangescontainer.h
index 6968830a6d8..0068e9da5f6 100644
--- a/src/libs/clangsupport/sourcerangescontainer.h
+++ b/src/libs/clangsupport/sourcerangescontainer.h
@@ -124,7 +124,7 @@ public:
 };
 
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangesContainer &container);
 
 } // namespace ClangBackEnd
diff --git a/src/libs/clangsupport/sourcerangesforquerymessage.h b/src/libs/clangsupport/sourcerangesforquerymessage.h
index 7aa410e1aef..75b3e18558f 100644
--- a/src/libs/clangsupport/sourcerangesforquerymessage.h
+++ b/src/libs/clangsupport/sourcerangesforquerymessage.h
@@ -78,7 +78,7 @@ private:
     SourceRangesContainer m_sourceRangesContainer;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangesForQueryMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangesForQueryMessage &message);
 std::ostream &operator<<(std::ostream &os, const SourceRangesForQueryMessage &message);
 
 DECLARE_MESSAGE(SourceRangesForQueryMessage)
diff --git a/src/libs/clangsupport/sourcerangewithtextcontainer.h b/src/libs/clangsupport/sourcerangewithtextcontainer.h
index 4edb2315509..7a2459d9124 100644
--- a/src/libs/clangsupport/sourcerangewithtextcontainer.h
+++ b/src/libs/clangsupport/sourcerangewithtextcontainer.h
@@ -112,7 +112,7 @@ private:
 
 using SourceRangeWithTextContainers = std::vector<SourceRangeWithTextContainer>;
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const SourceRangeWithTextContainer &container);
 std::ostream &operator<<(std::ostream &os, const SourceRangeWithTextContainer &container);
 } // namespace ClangBackEnd
 
diff --git a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h
index cc43e188726..2452ecaaf88 100644
--- a/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h
+++ b/src/libs/clangsupport/unregisterunsavedfilesforeditormessage.h
@@ -69,7 +69,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UnregisterUnsavedFilesForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const UnregisterUnsavedFilesForEditorMessage &message);
 
 DECLARE_MESSAGE(UnregisterUnsavedFilesForEditorMessage)
diff --git a/src/libs/clangsupport/updatepchprojectpartsmessage.h b/src/libs/clangsupport/updatepchprojectpartsmessage.h
index 67301faf447..96d552f73bd 100644
--- a/src/libs/clangsupport/updatepchprojectpartsmessage.h
+++ b/src/libs/clangsupport/updatepchprojectpartsmessage.h
@@ -94,7 +94,7 @@ private:
     V2::FileContainers m_generatedFiles;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdatePchProjectPartsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdatePchProjectPartsMessage &message);
 std::ostream &operator<<(std::ostream &out, const UpdatePchProjectPartsMessage &message);
 
 DECLARE_MESSAGE(UpdatePchProjectPartsMessage)
diff --git a/src/libs/clangsupport/updatetranslationunitsforeditormessage.h b/src/libs/clangsupport/updatetranslationunitsforeditormessage.h
index 3838ea89aec..c6fb3866130 100644
--- a/src/libs/clangsupport/updatetranslationunitsforeditormessage.h
+++ b/src/libs/clangsupport/updatetranslationunitsforeditormessage.h
@@ -68,7 +68,7 @@ private:
     QVector<FileContainer> m_fileContainers;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateTranslationUnitsForEditorMessage &message);
 std::ostream &operator<<(std::ostream &os, const UpdateTranslationUnitsForEditorMessage &message);
 
 DECLARE_MESSAGE(UpdateTranslationUnitsForEditorMessage)
diff --git a/src/libs/clangsupport/updatevisibletranslationunitsmessage.h b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h
index cdd57fe2f10..a3618453ca0 100644
--- a/src/libs/clangsupport/updatevisibletranslationunitsmessage.h
+++ b/src/libs/clangsupport/updatevisibletranslationunitsmessage.h
@@ -80,7 +80,7 @@ private:
     Utf8StringVector visibleEditorFilePaths_;
 };
 
-CMBIPC_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message);
+CLANGSUPPORT_EXPORT QDebug operator<<(QDebug debug, const UpdateVisibleTranslationUnitsMessage &message);
 std::ostream &operator<<(std::ostream &os, const UpdateVisibleTranslationUnitsMessage &message);
 
 DECLARE_MESSAGE(UpdateVisibleTranslationUnitsMessage)