diff --git a/lib/check.h b/lib/check.h
index bd00b5efe..0727f32ce 100644
--- a/lib/check.h
+++ b/lib/check.h
@@ -93,7 +93,7 @@ public:
     static void reportError(const ErrorLogger::ErrorMessage &errmsg);
 
     /** Base class used for whole-program analysis */
-    class FileInfo {
+    class CPPCHECKLIB FileInfo {
     public:
         FileInfo() {}
         virtual ~FileInfo() {}
diff --git a/lib/ctu.h b/lib/ctu.h
index 0c458b12d..b9268b71a 100644
--- a/lib/ctu.h
+++ b/lib/ctu.h
@@ -31,7 +31,7 @@
 
 /** @brief Whole program analysis (ctu=Cross Translation Unit) */
 namespace CTU {
-    class FileInfo : public Check::FileInfo {
+    class CPPCHECKLIB FileInfo : public Check::FileInfo {
     public:
         std::string toString() const override;
 
@@ -100,16 +100,16 @@ namespace CTU {
                 const FunctionCall * * const functionCallPtr) const;
     };
 
-    std::string toString(const std::list<FileInfo::UnsafeUsage> &unsafeUsage);
+    CPPCHECKLIB std::string toString(const std::list<FileInfo::UnsafeUsage> &unsafeUsage);
 
-    std::string getFunctionId(const Tokenizer *tokenizer, const Function *function);
+    CPPCHECKLIB std::string getFunctionId(const Tokenizer *tokenizer, const Function *function);
 
     /** @brief Parse current TU and extract file info */
-    FileInfo *getFileInfo(const Tokenizer *tokenizer);
+    CPPCHECKLIB FileInfo *getFileInfo(const Tokenizer *tokenizer);
 
-    std::list<FileInfo::UnsafeUsage> getUnsafeUsage(const Tokenizer *tokenizer, const Settings *settings, const Check *check, bool (*isUnsafeUsage)(const Check *check, const Token *argtok));
+    CPPCHECKLIB std::list<FileInfo::UnsafeUsage> getUnsafeUsage(const Tokenizer *tokenizer, const Settings *settings, const Check *check, bool (*isUnsafeUsage)(const Check *check, const Token *argtok));
 
-    std::list<FileInfo::UnsafeUsage> loadUnsafeUsageListFromXml(const tinyxml2::XMLElement *xmlElement);
+    CPPCHECKLIB std::list<FileInfo::UnsafeUsage> loadUnsafeUsageListFromXml(const tinyxml2::XMLElement *xmlElement);
 }
 
 /// @}
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index 388c10453..4f9f4bfa0 100644
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -29,7 +29,6 @@
     <ClCompile Include="..\cli\filelister.cpp" />
     <ClCompile Include="..\cli\threadexecutor.cpp" />
     <ClCompile Include="..\lib\astutils.cpp" />
-    <ClCompile Include="..\lib\ctu.cpp" />
     <ClCompile Include="options.cpp" />
     <ClCompile Include="test64bit.cpp" />
     <ClCompile Include="testassert.cpp" />
@@ -100,7 +99,6 @@
     <ClInclude Include="..\cli\filelister.h" />
     <ClInclude Include="..\cli\threadexecutor.h" />
     <ClInclude Include="..\lib\config.h" />
-    <ClInclude Include="..\lib\ctu.h" />
     <ClInclude Include="options.h" />
     <ClInclude Include="redirect.h" />
     <ClInclude Include="testsuite.h" />
diff --git a/test/testrunner.vcxproj.filters b/test/testrunner.vcxproj.filters
index 1ce2ad77d..353b72d10 100644
--- a/test/testrunner.vcxproj.filters
+++ b/test/testrunner.vcxproj.filters
@@ -211,9 +211,6 @@
     <ClCompile Include="..\lib\astutils.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib\ctu.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="options.h">
@@ -240,8 +237,5 @@
     <ClInclude Include="..\lib\config.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib\ctu.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file