diff --git a/cli/cli.vcxproj b/cli/cli.vcxproj
index 6530566dc..241397489 100644
--- a/cli/cli.vcxproj
+++ b/cli/cli.vcxproj
@@ -385,7 +385,6 @@
     <ClInclude Include="cmdlineparser.h" />
     <ClInclude Include="cppcheckexecutor.h" />
     <ClInclude Include="filelister.h" />
-    <ClInclude Include="pathmatch.h" />
     <ClInclude Include="threadexecutor.h" />
   </ItemGroup>
   <ItemGroup>
@@ -398,7 +397,6 @@
     <ClCompile Include="cppcheckexecutor.cpp" />
     <ClCompile Include="filelister.cpp" />
     <ClCompile Include="main.cpp" />
-    <ClCompile Include="pathmatch.cpp" />
     <ClCompile Include="threadexecutor.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/cli/cli.vcxproj.filters b/cli/cli.vcxproj.filters
index 665cea925..f95e472bb 100644
--- a/cli/cli.vcxproj.filters
+++ b/cli/cli.vcxproj.filters
@@ -29,17 +29,11 @@
     <ClInclude Include="filelister.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="pathmatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="pathmatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="threadexecutor.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
diff --git a/lib/cppcheck.vcxproj b/lib/cppcheck.vcxproj
index 87def3131..27b402da1 100644
--- a/lib/cppcheck.vcxproj
+++ b/lib/cppcheck.vcxproj
@@ -78,6 +78,7 @@
     <ClCompile Include="library.cpp" />
     <ClCompile Include="mathlib.cpp" />
     <ClCompile Include="path.cpp" />
+    <ClCompile Include="pathmatch.cpp" />
     <ClCompile Include="platform.cpp" />
     <ClCompile Include="preprocessor.cpp" />
     <ClCompile Include="importproject.cpp" />
@@ -127,6 +128,7 @@
     <ClInclude Include="library.h" />
     <ClInclude Include="mathlib.h" />
     <ClInclude Include="path.h" />
+    <ClInclude Include="pathmatch.h" />
     <ClInclude Include="platform.h" />
     <ClInclude Include="preprocessor.h" />
     <ClInclude Include="importproject.h" />
diff --git a/lib/cppcheck.vcxproj.filters b/lib/cppcheck.vcxproj.filters
index b4b11152c..fbeb2f233 100644
--- a/lib/cppcheck.vcxproj.filters
+++ b/lib/cppcheck.vcxproj.filters
@@ -149,6 +149,9 @@
     <ClCompile Include="platform.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="pathmatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="checkbufferoverrun.h">
@@ -298,6 +301,9 @@
     <ClInclude Include="platform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="pathmatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="version.rc" />
diff --git a/lib/path.cpp b/lib/path.cpp
index 97d05d4d3..ebec372c8 100644
--- a/lib/path.cpp
+++ b/lib/path.cpp
@@ -27,6 +27,8 @@
 #include <cctype>
 #ifndef _WIN32
 #include <unistd.h>
+#else
+#include <direct.h>
 #endif
 
 /** Is the filesystem case insensitive? */
@@ -190,7 +192,11 @@ const std::string Path::getCurrentPath()
 {
     char currentPath[4096];
 
+#ifndef _WIN32
     if (getcwd(currentPath, 4096) != 0)
+#else
+    if (_getcwd(currentPath, 4096) != 0)
+#endif
         return std::string(currentPath);
 
     return emptyString;
diff --git a/lib/pathmatch.h b/lib/pathmatch.h
index 0e9201a38..b3db17fe9 100644
--- a/lib/pathmatch.h
+++ b/lib/pathmatch.h
@@ -28,7 +28,7 @@
 /**
  * @brief Simple path matching for ignoring paths in CLI.
  */
-class PathMatch {
+class CPPCHECKLIB PathMatch {
 public:
 
     /**
diff --git a/test/testrunner.vcxproj b/test/testrunner.vcxproj
index 8c63a58c8..11f7ba8cc 100644
--- a/test/testrunner.vcxproj
+++ b/test/testrunner.vcxproj
@@ -27,7 +27,6 @@
     <ClCompile Include="..\cli\cmdlineparser.cpp" />
     <ClCompile Include="..\cli\cppcheckexecutor.cpp" />
     <ClCompile Include="..\cli\filelister.cpp" />
-    <ClCompile Include="..\cli\pathmatch.cpp" />
     <ClCompile Include="..\cli\threadexecutor.cpp" />
     <ClCompile Include="options.cpp" />
     <ClCompile Include="test64bit.cpp" />
@@ -94,7 +93,6 @@
   <ItemGroup>
     <ClInclude Include="..\cli\cmdlineparser.h" />
     <ClInclude Include="..\cli\filelister.h" />
-    <ClInclude Include="..\cli\pathmatch.h" />
     <ClInclude Include="..\cli\threadexecutor.h" />
     <ClInclude Include="..\lib\config.h" />
     <ClInclude Include="options.h" />
diff --git a/test/testrunner.vcxproj.filters b/test/testrunner.vcxproj.filters
index e00e47f20..1133e9811 100644
--- a/test/testrunner.vcxproj.filters
+++ b/test/testrunner.vcxproj.filters
@@ -124,9 +124,6 @@
     <ClCompile Include="testunusedvar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\cli\pathmatch.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\cli\filelister.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -216,9 +213,6 @@
     <ClInclude Include="testutils.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\cli\pathmatch.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\cli\filelister.h">
       <Filter>Header Files</Filter>
     </ClInclude>