Refactoring: Cleanup headers using checkheaders

lib/mathlib.h

@@ -20,7 +20,7 @@
 #ifndef mathlibH
 #define mathlibH
 
-#include "token.h"
+#include <string>
 
 /// @addtogroup Core
 /// @{

lib/preprocessor.cpp

@@ -22,6 +22,7 @@
 #include "token.h"
 #include "filelister.h"
 #include "path.h"
+#include "errorlogger.h"
 
 #include <algorithm>
 #include <stdexcept>

lib/preprocessor.h

@@ -25,8 +25,9 @@
 #include <istream>
 #include <string>
 #include <list>
-#include "errorlogger.h"
-#include "settings.h"
+
+class ErrorLogger;
+class Settings;
 
 /// @addtogroup Core
 /// @{

lib/tokenize.cpp

@@ -29,6 +29,7 @@
 #include "settings.h"
 #include "errorlogger.h"
 #include "check.h"
+#include "classinfo.h"
 
 #include <locale>
 #include <fstream>

lib/tokenize.h

@@ -25,8 +25,8 @@
 #include <string>
 #include <map>
 #include <vector>
-#include "classinfo.h"
 
+class ClassInfo;
 class Token;
 class ErrorLogger;
 class Settings;

test/testtokenize.cpp

@@ -25,6 +25,7 @@
 #include "testsuite.h"
 #include "tokenize.h"
 #include "token.h"
+#include "classinfo.h"
 
 extern std::ostringstream errout;
 class TestTokenizer : public TestFixture