diff --git a/Makefile b/Makefile
index 99963120d..711d31f01 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,8 @@ LIBOBJ =     lib/checkautovariables.o \
               lib/errorlogger.o \
               lib/executionpath.o \
               lib/filelister.o \
+              lib/filelister_unix.o \
+              lib/filelister_win32.o \
               lib/mathlib.o \
               lib/preprocessor.o \
               lib/settings.o \
@@ -126,9 +128,15 @@ lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/settings.h lib/toke
 lib/executionpath.o: lib/executionpath.cpp lib/executionpath.h lib/token.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/executionpath.o lib/executionpath.cpp
 
-lib/filelister.o: lib/filelister.cpp lib/filelister.h
+lib/filelister.o: lib/filelister.cpp lib/filelister.h lib/filelister_unix.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/filelister.o lib/filelister.cpp
 
+lib/filelister_unix.o: lib/filelister_unix.cpp lib/filelister.h lib/filelister_unix.h
+	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/filelister_unix.o lib/filelister_unix.cpp
+
+lib/filelister_win32.o: lib/filelister_win32.cpp lib/filelister.h lib/filelister_win32.h
+	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/filelister_win32.o lib/filelister_win32.cpp
+
 lib/mathlib.o: lib/mathlib.cpp lib/mathlib.h lib/token.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/mathlib.o lib/mathlib.cpp
 
diff --git a/lib/filelister_unix.cpp b/lib/filelister_unix.cpp
index 12e239fa9..0aea6c7b1 100644
--- a/lib/filelister_unix.cpp
+++ b/lib/filelister_unix.cpp
@@ -37,7 +37,7 @@
 ////// This code is POSIX-style systems ///////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-void FileLister::recursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive)
+void FileListerUnix::recursiveAddFiles(std::vector<std::string> &filenames, const std::string &path, bool recursive)
 {
     std::ostringstream oss;
     oss << path;
@@ -63,7 +63,7 @@ void FileLister::recursiveAddFiles(std::vector<std::string> &filenames, const st
         else if (recursive)
         {
             // Directory
-            FileLister::recursiveAddFiles(filenames, filename, recursive);
+            getFileLister()->recursiveAddFiles(filenames, filename, recursive);
         }
     }
     globfree(&glob_results);
diff --git a/lib/filelister_win32.cpp b/lib/filelister_win32.cpp
index 22767d7ed..889877610 100644
--- a/lib/filelister_win32.cpp
+++ b/lib/filelister_win32.cpp
@@ -83,7 +83,7 @@ static BOOL MyIsDirectory(std::string path)
     return (GetFileAttributes(path.c_str()) & FILE_ATTRIBUTE_DIRECTORY);
 #else
 // See http://msdn.microsoft.com/en-us/library/bb773621(VS.85).aspx
-return PathIsDirectory(path.c_str());
+    return PathIsDirectory(path.c_str());
 #endif
 }
 
diff --git a/lib/lib.pri b/lib/lib.pri
index d56336bbb..533bd8b49 100644
--- a/lib/lib.pri
+++ b/lib/lib.pri
@@ -15,16 +15,14 @@ HEADERS += $$PWD/check.h \
            $$PWD/errorlogger.h \
            $$PWD/executionpath.h \
            $$PWD/filelister.h \
+           $$PWD/filelister_unix.h \
+           $$PWD/filelister_win32.h \
            $$PWD/mathlib.h \
            $$PWD/preprocessor.h \
            $$PWD/settings.h \
            $$PWD/token.h \
            $$PWD/tokenize.h
 
-win32 {
-HEADERS += $$PWD/filelister_win32.h
-}           
-           
 SOURCES += $$PWD/checkautovariables.cpp \
            $$PWD/checkbufferoverrun.cpp \
            $$PWD/checkclass.cpp \
@@ -39,12 +37,10 @@ SOURCES += $$PWD/checkautovariables.cpp \
            $$PWD/errorlogger.cpp \
            $$PWD/executionpath.cpp \
            $$PWD/filelister.cpp \
+           $$PWD/filelister_unix.cpp \
+           $$PWD/filelister_win32.cpp \
            $$PWD/mathlib.cpp \
            $$PWD/preprocessor.cpp \
            $$PWD/settings.cpp \
            $$PWD/token.cpp \
            $$PWD/tokenize.cpp
-
-win32 {
-SOURCES += $$PWD/filelister_win32.cpp
-}           
diff --git a/tools/Makefile b/tools/Makefile
index 5bae6b644..e69de29bb 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,9 +0,0 @@
-
-all:	errmsg	dmake
-
-errmsg:	errmsg.cpp
-	g++ -Wall -pedantic -o errmsg errmsg.cpp
-
-dmake:	dmake.cpp
-	g++ -Wall -pedantic -o dmake dmake.cpp ../lib/filelister.cpp
-
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 66c3e2230..6a6bec0e3 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include "../lib/filelister.h"
+#include "../lib/filelister_unix.h"
 
 std::string objfile(std::string cppfile)
 {
@@ -82,8 +82,8 @@ static void compilefiles(std::ostream &fout, const std::vector<std::string> &fil
 
 static void getCppFiles(std::vector<std::string> &files, const std::string &path)
 {
-    FileLister::recursiveAddFiles(files, path, true);
-
+    FileListerUnix lister;
+    lister.recursiveAddFiles(files, path, true);
     // only get *.cpp files..
     for (std::vector<std::string>::iterator it = files.begin(); it != files.end();)
     {