cleaned up includes based on include-what-you-use

firewave · firewave · commit 976bf76fab04 · 2026-05-26T20:47:26.000+02:00
diff --git a/Makefile b/Makefile
@@ -723,13 +723,13 @@ cli/sehwrapper.o: cli/sehwrapper.cpp cli/sehwrapper.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/regex.h lib/settings.h lib/standards.h lib/timer.h lib/utils.h
+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/regex.h lib/settings.h lib/standards.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/singleexecutor.cpp
 
 cli/stacktrace.o: cli/stacktrace.cpp cli/stacktrace.h lib/config.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/stacktrace.cpp
 
-cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
+cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/threadexecutor.cpp
 
 test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h 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/path.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -50,7 +50,6 @@
 #include <iostream>
 #include <iterator>
 #include <list>
-#include <memory>
 #include <set>
 #include <sstream>
 #include <unordered_set>
@@ -61,6 +60,8 @@
 
 // xml is used for rules
 #include "xml.h"
+
+#include <memory>
 #endif
 
 static bool addFilesToList(const std::string& fileList, std::vector<std::string>& pathNames)
diff --git a/cli/processexecutor.cpp b/cli/processexecutor.cpp
@@ -37,16 +37,17 @@
 #include <numeric>
 #include <cassert>
 #include <cerrno>
+#include <chrono>
 #include <csignal>
 #include <cstdint>
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <list>
 #include <map>
+#include <memory>
 #include <sstream>
 #include <sys/select.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/cli/singleexecutor.cpp b/cli/singleexecutor.cpp
@@ -21,7 +21,6 @@
 #include "cppcheck.h"
 #include "filesettings.h"
 #include "settings.h"
-#include "timer.h"
 
 #include <cassert>
 #include <cstddef>
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -26,7 +26,6 @@
 #include "filesettings.h"
 #include "settings.h"
 #include "suppressions.h"
-#include "timer.h"
 
 #include <cassert>
 #include <cstdlib>
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -23,7 +23,6 @@
 #include "aboutdialog.h"
 #include "analyzerinfo.h"
 #include "checkers.h"
-#include "checkstatistics.h"
 #include "checkthread.h"
 #include "common.h"
 #include "cppcheck.h"
@@ -60,7 +59,6 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <fstream>
 #include <iterator>
 #include <list>
 #include <memory>
@@ -101,7 +99,6 @@
 #include <QSettings>
 #include <QSize>
 #include <QTimer>
-#include <QTemporaryFile>
 #include <QToolBar>
 #include <QUrl>
 #include <QVariant>
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -23,7 +23,6 @@
 #include "importproject.h"
 #include "library.h"
 #include "newsuppressiondialog.h"
-#include "path.h"
 #include "platform.h"
 #include "platforms.h"
 #include "projectfile.h"
diff --git a/gui/test/resultstree/testresultstree.cpp b/gui/test/resultstree/testresultstree.cpp
@@ -22,7 +22,6 @@
 
 // headers that declare mocked functions/variables
 #include "applicationlist.h"
-#include "common.h"
 #include "filesettings.h"
 #include "projectfile.h"
 #include "threadhandler.h"
diff --git a/lib/checks.cpp b/lib/checks.cpp
@@ -42,6 +42,8 @@
 #include "checkunusedvar.h"
 #include "checkvaarg.h"
 
+#include <memory>
+
 class CheckInstancesImpl
 {
 private:
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -31,7 +31,9 @@
 #include <string>
 #include <vector>
 
+#ifdef HAVE_RULES
 class TokenList;
+#endif
 struct FileSettings;
 class CheckUnusedFunctions;
 class Tokenizer;
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -35,6 +35,7 @@
 #include <iostream>
 #include <iterator>
 #include <stack>
+#include <stdexcept>
 #include <unordered_set>
 #include <utility>
 #include <vector>
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "config.h"
+#include "errortypes.h"
 #include "settings.h"
 #include "path.h"
 #include "summaries.h"
diff --git a/lib/settings.h b/lib/settings.h
@@ -23,7 +23,6 @@
 
 #include "addoninfo.h"
 #include "config.h"
-#include "errortypes.h"
 #include "library.h"
 #include "platform.h"
 #include "standards.h"
@@ -40,22 +39,27 @@
 #include <unordered_set>
 #include <utility>
 
-#include "regex.h"
-
 #if defined(USE_WINDOWS_SEH) || defined(USE_UNIX_SIGNAL_HANDLING)
 #include <cstdio>
 #endif
 
 #ifdef HAVE_RULES
+#include "errortypes.h"
+#include "regex.h"
+
 #include <memory>
 
 class Regex;
+#else
+enum class Severity : std::uint8_t;
 #endif
 
 struct Suppressions;
 namespace ValueFlow {
     class Value;
 }
+enum class Certainty : std::uint8_t;
+enum class Checks : std::uint8_t;
 
 /// @addtogroup Core
 /// @{
diff --git a/lib/suppressions.cpp b/lib/suppressions.cpp
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <cctype>   // std::isdigit, std::isalnum, etc
 #include <cstring>
+#include <exception>
 #include <functional> // std::bind, std::placeholders
 #include <sstream>
 #include <stdexcept>
diff --git a/lib/utils.h b/lib/utils.h
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 #include <array>
+#include <cctype>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
diff --git a/lib/vf_common.cpp b/lib/vf_common.cpp
@@ -19,6 +19,7 @@
 #include "vf_common.h"
 
 #include "astutils.h"
+#include "library.h"
 #include "mathlib.h"
 #include "path.h"
 #include "platform.h"
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
@@ -38,6 +38,7 @@
 #include <map>
 #include <memory>
 #include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@`
`42`	`42`	`#include "checkunusedvar.h"`
`43`	`43`	`#include "checkvaarg.h"`
`44`	`44`
	`45`	`+#include <memory>`
	`46`	`+`
`45`	`47`	`class CheckInstancesImpl`
`46`	`48`	`{`
`47`	`49`	`private:`