diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index a1ea5d59c..c7112d38e 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -9,6 +9,7 @@ SET(CHECKCLI_SRCS
   filelister.cpp
   main.cpp
   threadexecutor.cpp
+  pathmatch.cpp
   "${TINYXML_INCLUDE_DIR}tinystr.cpp"
   "${TINYXML_INCLUDE_DIR}tinyxml.cpp"
   "${TINYXML_INCLUDE_DIR}tinyxmlerror.cpp"
@@ -19,15 +20,12 @@ include("${CPPCHECK_LIB_DIR}library_sources.cmake")
 
 if(WIN32)
    # Add Windows resource file
-   set(CHECKCLI_SRCS ${CHECKCLI_SRCS} filelister_win32.cpp
-       cppcheck.rc)
+   set(CHECKCLI_SRCS ${CHECKCLI_SRCS} cppcheck.rc)
 
    if(NOT CYGWIN)
       # Windows needs additional shlwapi library.
       set(CHECK_LIBS ${CHECK_LIBS} shlwapi)
    endif()
-else()
-   set(CHECKCLI_SRCS ${CHECKCLI_SRCS} filelister_unix.cpp)
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCXX)
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index a06c90259..1b9d45674 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -47,6 +47,8 @@ SET(CHECK_HEADERS
   translationhandler.h
   txtreport.h
   xmlreport.h
+  xmlreportv1.h
+  xmlreportv2.h
 )
 
 # Source files
@@ -77,6 +79,8 @@ SET(CHECKGUI_SRCS
   translationhandler.cpp
   txtreport.cpp
   xmlreport.cpp
+  xmlreportv1.cpp
+  xmlreportv2.cpp
 )
 
 # UI files
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f54bf2a1e..880dc24be 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -8,6 +8,7 @@ SET(CHECKTEST_SRCS
   "${CPPCHECK_SOURCE_DIR}/cli/cppcheckexecutor.cpp"
   "${CPPCHECK_SOURCE_DIR}/cli/filelister.cpp"
   "${CPPCHECK_SOURCE_DIR}/cli/threadexecutor.cpp"
+  "${CPPCHECK_SOURCE_DIR}/cli/pathmatch.cpp"
   options.cpp
   testautovariables.cpp
   testbufferoverrun.cpp
@@ -51,16 +52,12 @@ set(CPPCHECK_LIB_DIR "${CPPCHECK_SOURCE_DIR}/lib/")
 include("${CPPCHECK_LIB_DIR}library_sources.cmake")
 
 if(WIN32)
-   set(CHECKTEST_SRCS ${CHECKTEST_SRCS}
-       "${CPPCHECK_SOURCE_DIR}/cli/filelister_win32.cpp")
-
    if(NOT CYGWIN)
       # Windows needs additional shlwapi library.
       set(CHECK_LIBS ${CHECK_LIBS} shlwapi)
    endif()
 else()
-   set(CHECKTEST_SRCS ${CHECKTEST_SRCS} testfilelister_unix.cpp
-       "${CPPCHECK_SOURCE_DIR}/cli/filelister_unix.cpp")
+   set(CHECKTEST_SRCS ${CHECKTEST_SRCS} testfilelister_unix.cpp)
 endif()
 
 if (CMAKE_COMPILER_IS_GNUCXX)