diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index 799e57846..59cc18bd2 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -23,7 +23,7 @@
 #include <ctime>
 #include <list>
 #include <string>
-#include "settings.h"
+
 class Token;
 class Tokenizer;
 
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
index db1030721..93c9582d8 100644
--- a/lib/preprocessor.cpp
+++ b/lib/preprocessor.cpp
@@ -23,6 +23,7 @@
 #include "filelister.h"
 #include "path.h"
 #include "errorlogger.h"
+#include "settings.h"
 
 #include <algorithm>
 #include <stdexcept>
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 3d10dde98..fc1e9bbf2 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -25,6 +25,8 @@
 #include "preprocessor.h"
 #include "tokenize.h"
 #include "token.h"
+#include "settings.h"
+
 #include <map>
 #include <string>
 #include <sstream>
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
index de6048528..bef9e7e64 100644
--- a/test/testsimplifytokens.cpp
+++ b/test/testsimplifytokens.cpp
@@ -21,6 +21,8 @@
 #include "testsuite.h"
 #include "tokenize.h"
 #include "token.h"
+#include "settings.h"
+
 #include <sstream>
 
 extern std::ostringstream errout;
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
index 2557e418d..50f39ca80 100644
--- a/test/testtokenize.cpp
+++ b/test/testtokenize.cpp
@@ -21,11 +21,12 @@
 // the code for a known configuration, it generates the code for each configuration.
 
 
-#include <cstring>
 #include "testsuite.h"
 #include "tokenize.h"
 #include "token.h"
 #include "classinfo.h"
+#include "settings.h"
+#include <cstring>
 
 extern std::ostringstream errout;
 class TestTokenizer : public TestFixture