diff --git a/Makefile b/Makefile
index 56c822151..9e74ff9f6 100644
--- a/Makefile
+++ b/Makefile
@@ -128,7 +128,7 @@ lib/checkunusedfunctions.o: lib/checkunusedfunctions.cpp lib/checkunusedfunction
 lib/cppcheck.o: lib/cppcheck.cpp lib/cppcheck.h lib/settings.h lib/errorlogger.h lib/checkunusedfunctions.h lib/check.h lib/token.h lib/tokenize.h lib/preprocessor.h lib/filelister.h lib/path.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/cppcheck.o lib/cppcheck.cpp
 
-lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/tokenize.h lib/token.h lib/path.h
+lib/errorlogger.o: lib/errorlogger.cpp lib/errorlogger.h lib/path.h
 	$(CXX) $(CXXFLAGS) -Ilib -c -o lib/errorlogger.o lib/errorlogger.cpp
 
 lib/executionpath.o: lib/executionpath.cpp lib/executionpath.h lib/token.h
diff --git a/lib/check.h b/lib/check.h
index dd591781c..6d71a31bb 100644
--- a/lib/check.h
+++ b/lib/check.h
@@ -26,6 +26,7 @@
 
 #include <list>
 #include <iostream>
+#include <set>
 
 /// @addtogroup Core
 /// @{
diff --git a/lib/checkexceptionsafety.cpp b/lib/checkexceptionsafety.cpp
index 4d813195c..ef41e998e 100644
--- a/lib/checkexceptionsafety.cpp
+++ b/lib/checkexceptionsafety.cpp
@@ -19,9 +19,7 @@
 //---------------------------------------------------------------------------
 #include "checkexceptionsafety.h"
 
-#include "tokenize.h"
 #include "token.h"
-#include "errorlogger.h"
 
 //---------------------------------------------------------------------------
 
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
index a64978074..a189556c6 100644
--- a/lib/checkother.cpp
+++ b/lib/checkother.cpp
@@ -20,7 +20,6 @@
 //---------------------------------------------------------------------------
 #include "checkother.h"
 #include "mathlib.h"
-#include "tokenize.h"
 #include "executionpath.h"
 
 #include <algorithm>
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index 1b9cb09c1..3e39d0691 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -17,7 +17,6 @@
  */
 
 #include "checkstl.h"
-#include "tokenize.h"
 #include "token.h"
 
 
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
index 4923497a3..97536aab9 100644
--- a/lib/errorlogger.cpp
+++ b/lib/errorlogger.cpp
@@ -17,10 +17,10 @@
  */
 
 #include "errorlogger.h"
-#include "tokenize.h"
 #include "path.h"
 
 #include <sstream>
+#include <vector>
 
 ErrorLogger::ErrorMessage::ErrorMessage()
     :_severity(Severity::none)
diff --git a/lib/filelister_unix.cpp b/lib/filelister_unix.cpp
index b8332ed25..a2cb5afe4 100644
--- a/lib/filelister_unix.cpp
+++ b/lib/filelister_unix.cpp
@@ -20,8 +20,6 @@
 #include <vector>
 #include <cstring>
 #include <string>
-#include <cctype>
-#include <algorithm>
 
 #ifndef _WIN32 // POSIX-style system
 #include <glob.h>
diff --git a/lib/settings.cpp b/lib/settings.cpp
index 7a5a9780f..555e6cf7e 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -24,6 +24,7 @@
 #include <stdexcept>
 #include <iostream>
 #include <cctype>   // std::isdigit, std::isalnum, etc
+#include <set>
 
 Settings::Settings()
 {
diff --git a/lib/settings.h b/lib/settings.h
index 31c67e450..4c4c585c9 100644
--- a/lib/settings.h
+++ b/lib/settings.h
@@ -23,7 +23,6 @@
 #include <string>
 #include <istream>
 #include <map>
-#include <set>
 
 /// @addtogroup Core
 /// @{
diff --git a/lib/tokenize.h b/lib/tokenize.h
index 1c0d47716..bb7991fda 100644
--- a/lib/tokenize.h
+++ b/lib/tokenize.h
@@ -21,7 +21,6 @@
 #ifndef tokenizeH
 #define tokenizeH
 //---------------------------------------------------------------------------
-#include <list>
 #include <string>
 #include <map>
 #include <vector>