cleaned up includes based on include-what-you-use (#7895)

firewave · web-flow · commit 5ace300a65fa · 2025-10-17T23:16:53.000+02:00
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -33,6 +33,7 @@
 #include "errortypes.h"
 #include "filesettings.h"
 #include "json.h"
+#include "path.h"
 #include "settings.h"
 #include "singleexecutor.h"
 #include "suppressions.h"
diff --git a/gui/threadresult.cpp b/gui/threadresult.cpp
@@ -23,11 +23,7 @@
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "importproject.h"
-#include "path.h"
 
-#include <algorithm>
-#include <cstddef>
-#include <iterator>
 #include <numeric>
 #include <utility>
 
diff --git a/lib/astutils.cpp b/lib/astutils.cpp
@@ -37,7 +37,6 @@
 #include "checkclass.h"
 
 #include <algorithm>
-#include <cassert>
 #include <cstring>
 #include <functional>
 #include <initializer_list>
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -36,6 +36,7 @@
 #include "vfvalue.h"
 
 #include <algorithm> // find_if()
+#include <cassert>
 #include <cctype>
 #include <cstddef>
 #include <cstdint>
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -32,6 +32,7 @@
 #include "valueflow.h"
 
 #include <algorithm>
+#include <cstddef>
 #include <cstdint>
 #include <list>
 #include <set>
diff --git a/lib/checkunusedvar.h b/lib/checkunusedvar.h
@@ -24,7 +24,6 @@
 #include "check.h"
 #include "config.h"
 
-#include <list>
 #include <map>
 #include <string>
 
@@ -34,8 +33,6 @@ class Settings;
 class Token;
 class Type;
 class Variables;
-class Variable;
-class Function;
 class Tokenizer;
 
 /// @addtogroup Checks
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -74,8 +74,6 @@
 
 #include <simplecpp.h>
 
-class SymbolDatabase;
-
 static constexpr char Version[] = CPPCHECK_VERSION_STRING;
 static constexpr char ExtraVersion[] = "";
 
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -26,7 +26,6 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <fstream>
 #include <functional>
 #include <list>
 #include <memory>
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -33,7 +33,6 @@
 #include <fstream>
 #include <iostream>
 #include <iterator>
-#include <sstream>
 #include <stack>
 #include <unordered_set>
 #include <utility>
diff --git a/lib/pathmatch.cpp b/lib/pathmatch.cpp
@@ -23,6 +23,7 @@
 #include <algorithm>
 #include <stack>
 #include <string>
+#include <utility>
 #include <vector>
 
 
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -34,6 +34,7 @@
 #include <cassert>
 #include <cstddef>
 #include <iterator>
+#include <memory>
 #include <sstream>
 #include <utility>
 
diff --git a/lib/preprocessor.h b/lib/preprocessor.h
@@ -28,7 +28,6 @@
 #include <cstdint>
 #include <istream>
 #include <list>
-#include <map>
 #include <set>
 #include <string>
 #include <utility>
diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
@@ -40,7 +40,7 @@
 #include <list>
 #include <memory>
 #include <stack>
-#include <sstream>
+#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/lib/smallvector.h b/lib/smallvector.h
@@ -24,7 +24,7 @@
 static constexpr std::size_t DefaultSmallVectorSize = 3;
 
 #ifdef HAVE_BOOST
-#include <boost/container/small_vector.hpp>
+#include <boost/container/small_vector.hpp> // IWYU pragma: export
 
 template<typename T, std::size_t N = DefaultSmallVectorSize>
 using SmallVector = boost::container::small_vector<T, N>;
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -40,6 +40,7 @@
 #include <algorithm>
 #include <cassert>
 #include <cstring>
+#include <functional>
 #include <initializer_list>
 #include <iomanip>
 #include <iostream>
diff --git a/lib/token.h b/lib/token.h
@@ -33,6 +33,7 @@
 #include <cstdint>
 #include <cstddef>
 #include <functional>
+#include <limits>
 #include <list>
 #include <memory>
 #include <ostream>
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -47,7 +47,7 @@
 #include <ctime>
 #include <iostream>
 #include <iterator>
-#include <exception>
+#include <limits>
 #include <memory>
 #include <set>
 #include <sstream>
diff --git a/lib/tokenlist.h b/lib/tokenlist.h
@@ -25,7 +25,7 @@
 #include "standards.h"
 
 #include <cstddef>
-#include <iosfwd>
+#include <cstdint>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/lib/utils.cpp b/lib/utils.cpp
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <cctype>
-#include <iterator>
 #include <stack>
 #include <utility>
 
diff --git a/test/fixture.h b/test/fixture.h
@@ -24,6 +24,7 @@
 #include "color.h"
 #include "config.h"
 #include "errorlogger.h"
+#include "errortypes.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
@@ -41,8 +42,6 @@
 
 class options;
 class Tokenizer;
-enum class Certainty : std::uint8_t;
-enum class Severity : std::uint8_t;
 
 class TestFixture : public ErrorLogger {
 private:
diff --git a/test/testclangimport.cpp b/test/testclangimport.cpp
@@ -16,6 +16,7 @@
 
 #include "clangimport.h"
 #include "fixture.h"
+#include "mathlib.h"
 #include "platform.h"
 #include "settings.h"
 #include "standards.h"
diff --git a/test/testcppcheck.cpp b/test/testcppcheck.cpp
@@ -31,7 +31,6 @@
 #include "suppressions.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <cstdlib>
 #include <list>
 #include <sstream>
diff --git a/test/testexecutor.cpp b/test/testexecutor.cpp
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "config.h"
 #include "errorlogger.h"
 #include "errortypes.h"
 #include "executor.h"
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
@@ -22,6 +22,7 @@
 #include "settings.h"
 #include "fixture.h"
 
+#include <cstddef>
 #include <string>
 
 class TestIncompleteStatement : public TestFixture {
diff --git a/test/testlibrary.cpp b/test/testlibrary.cpp
@@ -28,7 +28,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <map>
-#include <sstream>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/test/testother.cpp b/test/testother.cpp
@@ -25,6 +25,7 @@
 #include "standards.h"
 
 #include <cstddef>
+#include <sstream>
 #include <string>
 
 static std::string unionZeroInitMessage(int lno, int cno, const std::string &varName, const std::string &largestMemberName)
diff --git a/test/testprogrammemory.cpp b/test/testprogrammemory.cpp
@@ -21,8 +21,11 @@
 #include "helpers.h"
 #include "token.h"
 #include "programmemory.h"
+#include "utils.h"
 #include "vfvalue.h"
 
+#include <stdexcept>
+
 class TestProgramMemory : public TestFixture {
 public:
     TestProgramMemory() : TestFixture("TestProgramMemory") {}
diff --git a/test/testregex.cpp b/test/testregex.cpp
@@ -22,6 +22,7 @@
 #include "regex.h"
 
 #include <list>
+#include <memory>
 #include <string>
 #include <utility>
 
diff --git a/test/teststring.cpp b/test/teststring.cpp
@@ -23,6 +23,7 @@
 #include "settings.h"
 #include "fixture.h"
 
+#include <cstddef>
 #include <string>
 
 class TestString : public TestFixture {
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
@@ -30,6 +30,7 @@
 #include "suppressions.h"
 #include "threadexecutor.h"
 
+#include <cstdint>
 #include <cstring>
 #include <list>
 #include <map>
diff --git a/test/testuninitvar.cpp b/test/testuninitvar.cpp
@@ -23,6 +23,7 @@
 #include "helpers.h"
 #include "settings.h"
 
+#include <cstddef>
 #include <list>
 #include <string>
 
diff --git a/test/testunusedprivfunc.cpp b/test/testunusedprivfunc.cpp
@@ -23,6 +23,7 @@
 #include "settings.h"
 #include "fixture.h"
 
+#include <cstddef>
 #include <string>
 
 class TestUnusedPrivateFunction : public TestFixture {
diff --git a/test/testunusedvar.cpp b/test/testunusedvar.cpp
@@ -23,6 +23,7 @@
 #include "preprocessor.h"
 #include "settings.h"
 
+#include <cstddef>
 #include <list>
 #include <string>
 
