diff --git a/src/tools/clangpchmanagerbackend/source/changedfilepathcompressor.h b/src/libs/clangsupport/changedfilepathcompressor.h
similarity index 95%
rename from src/tools/clangpchmanagerbackend/source/changedfilepathcompressor.h
rename to src/libs/clangsupport/changedfilepathcompressor.h
index b808db64592..a6166c3d4fb 100644
--- a/src/tools/clangpchmanagerbackend/source/changedfilepathcompressor.h
+++ b/src/libs/clangsupport/changedfilepathcompressor.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <clangpchmanagerbackend_global.h>
+#include "clangsupport_global.h"
 
 #include <utils/smallstringvector.h>
 
@@ -36,7 +36,7 @@
 namespace ClangBackEnd {
 
 template <typename Timer>
-class ChangedFilePathCompressor non_unittest_final
+class ChangedFilePathCompressor
 {
 public:
     ChangedFilePathCompressor()
diff --git a/src/tools/clangpchmanagerbackend/source/clangpathwatcher.h b/src/libs/clangsupport/clangpathwatcher.h
similarity index 99%
rename from src/tools/clangpchmanagerbackend/source/clangpathwatcher.h
rename to src/libs/clangsupport/clangpathwatcher.h
index cbfb3c120bf..8a315f47e17 100644
--- a/src/tools/clangpchmanagerbackend/source/clangpathwatcher.h
+++ b/src/libs/clangsupport/clangpathwatcher.h
@@ -28,9 +28,8 @@
 #include "clangpathwatcherinterface.h"
 #include "clangpathwatchernotifier.h"
 #include "changedfilepathcompressor.h"
-
-#include <filepathcachinginterface.h>
-#include <stringcache.h>
+#include "filepathcachinginterface.h"
+#include "stringcache.h"
 
 #include <QTimer>
 
diff --git a/src/tools/clangpchmanagerbackend/source/clangpathwatcherinterface.cpp b/src/libs/clangsupport/clangpathwatcherinterface.cpp
similarity index 100%
rename from src/tools/clangpchmanagerbackend/source/clangpathwatcherinterface.cpp
rename to src/libs/clangsupport/clangpathwatcherinterface.cpp
diff --git a/src/tools/clangpchmanagerbackend/source/clangpathwatcherinterface.h b/src/libs/clangsupport/clangpathwatcherinterface.h
similarity index 96%
rename from src/tools/clangpchmanagerbackend/source/clangpathwatcherinterface.h
rename to src/libs/clangsupport/clangpathwatcherinterface.h
index fbd1776e5c7..41142a9b0fd 100644
--- a/src/tools/clangpchmanagerbackend/source/clangpathwatcherinterface.h
+++ b/src/libs/clangsupport/clangpathwatcherinterface.h
@@ -33,7 +33,7 @@ namespace ClangBackEnd {
 
 class ClangPathWatcherNotifier;
 
-class ClangPathWatcherInterface
+class CLANGSUPPORT_EXPORT ClangPathWatcherInterface
 {
 public:
     virtual ~ClangPathWatcherInterface();
diff --git a/src/tools/clangpchmanagerbackend/source/clangpathwatchernotifier.cpp b/src/libs/clangsupport/clangpathwatchernotifier.cpp
similarity index 100%
rename from src/tools/clangpchmanagerbackend/source/clangpathwatchernotifier.cpp
rename to src/libs/clangsupport/clangpathwatchernotifier.cpp
diff --git a/src/tools/clangpchmanagerbackend/source/clangpathwatchernotifier.h b/src/libs/clangsupport/clangpathwatchernotifier.h
similarity index 94%
rename from src/tools/clangpchmanagerbackend/source/clangpathwatchernotifier.h
rename to src/libs/clangsupport/clangpathwatchernotifier.h
index c95ab56e516..15001186f36 100644
--- a/src/tools/clangpchmanagerbackend/source/clangpathwatchernotifier.h
+++ b/src/libs/clangsupport/clangpathwatchernotifier.h
@@ -25,11 +25,13 @@
 
 #pragma once
 
+#include "clangsupport_global.h"
+
 #include <utils/smallstringvector.h>
 
 namespace ClangBackEnd {
 
-class ClangPathWatcherNotifier
+class CLANGSUPPORT_EXPORT ClangPathWatcherNotifier
 {
 public:
     virtual ~ClangPathWatcherNotifier();
diff --git a/src/libs/clangsupport/clangsupport-lib.pri b/src/libs/clangsupport/clangsupport-lib.pri
index 30c1d03446d..52e27bfde6c 100644
--- a/src/libs/clangsupport/clangsupport-lib.pri
+++ b/src/libs/clangsupport/clangsupport-lib.pri
@@ -16,6 +16,8 @@ SOURCES += \
     $$PWD/clangcodemodelconnectionclient.cpp \
     $$PWD/clangcodemodelserverinterface.cpp \
     $$PWD/clangcodemodelserverproxy.cpp \
+    $$PWD/clangpathwatcherinterface.cpp \
+    $$PWD/clangpathwatchernotifier.cpp \
     $$PWD/cmbalivemessage.cpp \
     $$PWD/cmbcodecompletedmessage.cpp \
     $$PWD/cmbcompletecodemessage.cpp \
@@ -87,6 +89,9 @@ SOURCES += \
 
 HEADERS += \
     $$PWD/cancelmessage.h \
+    $$PWD/clangpathwatcher.h \
+    $$PWD/clangpathwatcherinterface.h \
+    $$PWD/clangpathwatchernotifier.h \
     $$PWD/clangsupportdebugutils.h \
     $$PWD/clangsupport_global.h \
     $$PWD/clangcodemodelclientinterface.h \
@@ -124,6 +129,7 @@ HEADERS += \
     $$PWD/fixitcontainer.h \
     $$PWD/followsymbolmessage.h \
     $$PWD/highlightingmarkcontainer.h \
+    $$PWD/idpaths.h \
     $$PWD/ipcclientinterface.h \
     $$PWD/ipcinterface.h \
     $$PWD/ipcserverinterface.h \
diff --git a/src/tools/clangpchmanagerbackend/source/idpaths.h b/src/libs/clangsupport/idpaths.h
similarity index 98%
rename from src/tools/clangpchmanagerbackend/source/idpaths.h
rename to src/libs/clangsupport/idpaths.h
index 3b24ba7538e..9fa06bdd4d2 100644
--- a/src/tools/clangpchmanagerbackend/source/idpaths.h
+++ b/src/libs/clangsupport/idpaths.h
@@ -27,7 +27,7 @@
 
 #include <utils/smallstring.h>
 
-#include <filepathid.h>
+#include "filepathid.h"
 
 namespace ClangBackEnd {
 
diff --git a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.qbs b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.qbs
index c01a5a4d807..0cec86cda79 100644
--- a/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.qbs
+++ b/src/tools/clangpchmanagerbackend/clangpchmanagerbackend.qbs
@@ -36,18 +36,11 @@ QtcTool {
     Group {
         prefix: "source/"
         files: [
-            "changedfilepathcompressor.h",
-            "clangpathwatcherinterface.cpp",
-            "clangpathwatcherinterface.h",
-            "clangpathwatchernotifier.cpp",
-            "clangpathwatchernotifier.h",
-            "clangpathwatcher.h",
             "clangpchmanagerbackend_global.h",
             "collectincludesaction.h",
             "collectincludespreprocessorcallbacks.h",
             "collectincludestoolaction.h",
             "environment.h",
-            "idpaths.h",
             "includecollector.cpp",
             "includecollector.h",
             "pchcreatorinterface.cpp",
diff --git a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
index 686d9a5d18a..b5ac18219cd 100644
--- a/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
+++ b/src/tools/clangpchmanagerbackend/source/clangpchmanagerbackend-source.pri
@@ -4,9 +4,7 @@ SOURCES += \
     $$PWD/pchmanagerserver.cpp \
     $$PWD/projectparts.cpp \
     $$PWD/pchcreatorinterface.cpp \
-    $$PWD/clangpathwatcherinterface.cpp \
     $$PWD/projectpartsinterface.cpp \
-    $$PWD/clangpathwatchernotifier.cpp \
     $$PWD/pchgeneratornotifierinterface.cpp \
     $$PWD/pchgeneratorinterface.cpp
 
@@ -15,14 +13,9 @@ HEADERS += \
     $$PWD/clangpchmanagerbackend_global.h \
     $$PWD/pchnotcreatederror.h \
     $$PWD/environment.h \
-    $$PWD/clangpathwatcher.h \
     $$PWD/projectparts.h \
-    $$PWD/idpaths.h \
     $$PWD/pchcreatorinterface.h \
-    $$PWD/clangpathwatcherinterface.h \
     $$PWD/projectpartsinterface.h \
-    $$PWD/clangpathwatchernotifier.h \
-    $$PWD/changedfilepathcompressor.h \
     $$PWD/pchgenerator.h \
     $$PWD/pchgeneratornotifierinterface.h \
     $$PWD/pchgeneratorinterface.h