diff --git a/Makefile b/Makefile
index 86d73cb7c..8b6fad9a1 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ install:	cppcheck
 
 ###### Build
 
-src/checkbufferoverrun.o: src/checkbufferoverrun.cpp src/checkbufferoverrun.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
+src/checkbufferoverrun.o: src/checkbufferoverrun.cpp src/checkbufferoverrun.h src/settings.h src/tokenize.h src/errorlogger.h src/token.h
 	g++ $(CXXFLAGS) -c -o src/checkbufferoverrun.o src/checkbufferoverrun.cpp
 
 src/checkclass.o: src/checkclass.cpp src/checkclass.h src/tokenize.h src/settings.h src/errorlogger.h src/token.h
diff --git a/src/checkbufferoverrun.cpp b/src/checkbufferoverrun.cpp
index a532bb3d3..de2ce334a 100644
--- a/src/checkbufferoverrun.cpp
+++ b/src/checkbufferoverrun.cpp
@@ -23,6 +23,9 @@
 
 #include "checkbufferoverrun.h"
 
+#include "tokenize.h"
+#include "errorlogger.h"
+
 #include <algorithm>
 #include <sstream>
 #include <list>
diff --git a/src/checkbufferoverrun.h b/src/checkbufferoverrun.h
index e652e5cfd..faac4e0bb 100644
--- a/src/checkbufferoverrun.h
+++ b/src/checkbufferoverrun.h
@@ -23,8 +23,12 @@
 #define CheckBufferOverrunH
 //---------------------------------------------------------------------------
 
-#include "tokenize.h"
-#include "errorlogger.h"
+#include "settings.h"
+#include <list>
+
+class ErrorLogger;
+class Token;
+class Tokenizer;
 
 class CheckBufferOverrunClass
 {