diff --git a/Makefile b/Makefile
index da5d9e73dfa..bb07f42c208 100644
--- a/Makefile
+++ b/Makefile
@@ -710,7 +710,7 @@ cli/processexecutor.o: cli/processexecutor.cpp cli/executor.h cli/processexecuto
 cli/sehwrapper.o: cli/sehwrapper.cpp cli/sehwrapper.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/sehwrapper.cpp
 
-cli/signalhandler.o: cli/signalhandler.cpp cli/signalhandler.h cli/stacktrace.h lib/config.h lib/utils.h
+cli/signalhandler.o: cli/signalhandler.cpp cli/signalhandler.h cli/stacktrace.h lib/config.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/signalhandler.cpp
 
 cli/singleexecutor.o: cli/singleexecutor.cpp cli/executor.h cli/singleexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h
@@ -761,7 +761,7 @@ test/testcharvar.o: test/testcharvar.cpp lib/addoninfo.h lib/check.h lib/checker
 test/testcheck.o: test/testcheck.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheck.cpp
 
-test/testcheckersreport.o: test/testcheckersreport.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
+test/testcheckersreport.o: test/testcheckersreport.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/utils.h test/fixture.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testcheckersreport.cpp
 
 test/testclangimport.o: test/testclangimport.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/clangimport.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/smallvector.h lib/sourcelocation.h lib/standards.h lib/symboldatabase.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h
diff --git a/cli/signalhandler.cpp b/cli/signalhandler.cpp
index e1ea7f31267..f8fd5a4e0a0 100644
--- a/cli/signalhandler.cpp
+++ b/cli/signalhandler.cpp
@@ -24,8 +24,6 @@
 
 #if defined(USE_UNIX_SIGNAL_HANDLING)
 
-#include "utils.h"
-
 #ifdef USE_UNIX_BACKTRACE_SUPPORT
 #include "stacktrace.h"
 #endif
diff --git a/gui/threadhandler.h b/gui/threadhandler.h
index f98d5a6508d..17f011c32ac 100644
--- a/gui/threadhandler.h
+++ b/gui/threadhandler.h
@@ -24,6 +24,7 @@
 #include "suppressions.h"
 #include "threadresult.h"
 
+#include <cstddef>
 #include <list>
 #include <memory>
 #include <set>
diff --git a/gui/threadresult.h b/gui/threadresult.h
index f7ba6ad8216..1224b3c539d 100644
--- a/gui/threadresult.h
+++ b/gui/threadresult.h
@@ -25,6 +25,7 @@
 #include "filesettings.h"
 #include "checkthread.h"
 
+#include <cstddef>
 #include <list>
 #include <mutex>
 #include <string>
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
index 8f220f34552..6f919ec3651 100644
--- a/lib/analyzerinfo.cpp
+++ b/lib/analyzerinfo.cpp
@@ -23,11 +23,13 @@
 #include "path.h"
 #include "utils.h"
 
+#include <array>
 #include <cstring>
 #include <exception>
 #include <iostream>
 #include <map>
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 
 #include "xml.h"
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
index 0bbe02f3d7b..a3d55747fe3 100644
--- a/lib/checkersreport.cpp
+++ b/lib/checkersreport.cpp
@@ -20,8 +20,8 @@
 
 #include "addoninfo.h"
 #include "checkers.h"
-#include "errortypes.h"
 #include "settings.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <cstddef>
diff --git a/lib/checkleakautovar.cpp b/lib/checkleakautovar.cpp
index bb80ead84a5..803ea9967a3 100644
--- a/lib/checkleakautovar.cpp
+++ b/lib/checkleakautovar.cpp
@@ -34,6 +34,7 @@
 #include "tokenize.h"
 #include "tokenlist.h"
 #include "utils.h"
+#include "vfvalue.h"
 
 #include <algorithm>
 #include <array>
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index 81eb36b053d..4e36467bf04 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -28,6 +28,7 @@
 #include "symboldatabase.h"
 #include "token.h"
 #include "tokenize.h"
+#include "utils.h"
 
 #include <algorithm>
 #include <cstddef>
diff --git a/lib/errorlogger.h b/lib/errorlogger.h
index 8c86224aa0f..a6f2a8ebdfb 100644
--- a/lib/errorlogger.h
+++ b/lib/errorlogger.h
@@ -24,12 +24,12 @@
 #include "config.h"
 #include "errortypes.h"
 
-#include <cstddef>
 #include <cstdint>
 #include <ctime>
 #include <list>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 #include <map>
 
diff --git a/lib/library.h b/lib/library.h
index 10b9463cbaa..709a0db2b90 100644
--- a/lib/library.h
+++ b/lib/library.h
@@ -24,7 +24,6 @@
 #include "config.h"
 #include "mathlib.h"
 #include "standards.h"
-#include "utils.h"
 
 #include <array>
 #include <cstdint>
diff --git a/lib/settings.cpp b/lib/settings.cpp
index cd1f094e1c1..0708a37516b 100644
--- a/lib/settings.cpp
+++ b/lib/settings.cpp
@@ -21,7 +21,6 @@
 #include "path.h"
 #include "summaries.h"
 #include "suppressions.h"
-#include "utils.h"
 #include "vfvalue.h"
 
 #include <cctype>
@@ -29,7 +28,6 @@
 #include <cstring>
 #include <fstream>
 #include <iostream>
-#include <map>
 #include <utility>
 
 #include "json.h"
diff --git a/lib/summaries.h b/lib/summaries.h
index 26d61e75e65..d720d023306 100644
--- a/lib/summaries.h
+++ b/lib/summaries.h
@@ -23,6 +23,7 @@
 
 #include "config.h"
 
+#include <cstddef>
 #include <set>
 #include <string>
 
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
index 34eb8b52e5e..241ec3d1f9f 100644
--- a/lib/suppressions.cpp
+++ b/lib/suppressions.cpp
@@ -18,6 +18,7 @@
 
 #include "suppressions.h"
 
+#include "addoninfo.h"
 #include "errorlogger.h"
 #include "filesettings.h"
 #include "path.h"
@@ -33,6 +34,7 @@
 #include <cstring>
 #include <functional> // std::bind, std::placeholders
 #include <sstream>
+#include <stdexcept>
 #include <utility>
 
 #include "xml.h"
diff --git a/test/testcheckersreport.cpp b/test/testcheckersreport.cpp
index 85ef3547fd5..eafe7b8848f 100644
--- a/test/testcheckersreport.cpp
+++ b/test/testcheckersreport.cpp
@@ -17,13 +17,11 @@
  */
 
 
+#include "addoninfo.h"
 #include "checkersreport.h"
 #include "fixture.h"
-#include "helpers.h"
 #include "settings.h"
 
-#include <cstddef>
-
 class TestCheckersReport : public TestFixture {
 public:
     TestCheckersReport() : TestFixture("TestCheckersReport") {}
diff --git a/test/testsimplifyusing.cpp b/test/testsimplifyusing.cpp
index 8e27bdc12d4..7359613510f 100644
--- a/test/testsimplifyusing.cpp
+++ b/test/testsimplifyusing.cpp
@@ -21,6 +21,7 @@
 #include "helpers.h"
 #include "platform.h"
 #include "settings.h"
+#include "standards.h"
 #include "token.h"
 #include "utils.h"
 
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 4f6628f20d6..eaa524e3640 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "addoninfo.h"
 #include "config.h"
 #include "cppcheck.h"
 #include "cppcheckexecutor.h"
@@ -32,6 +33,7 @@
 #include "threadexecutor.h"
 
 #include <cstring>
+#include <initializer_list>
 #include <list>
 #include <map>
 #include <memory>