diff --git a/assembler/assembly-debug.h b/assembler/assembly-debug.h
index cf1f325b31e848a39ce23cee35c18228298eccbf..38eea1d48dc2c19dc34b1d6d39877f3d072ff936 100644
--- a/assembler/assembly-debug.h
+++ b/assembler/assembly-debug.h
@@ -16,8 +16,6 @@
 #ifndef PANDA_ASSEMBLER_ASSEMBLY_DEBUG_H_
 #define PANDA_ASSEMBLER_ASSEMBLY_DEBUG_H_
 
-#include <cstddef>
-#include <cstdint>
 #include <string>
 
 namespace panda::pandasm::debuginfo {
diff --git a/assembler/assembly-label.h b/assembler/assembly-label.h
index ea3e3ed127856ff15c94313f75efa8d78fd6c8b6..204f1bfec68c28426d3b3cce1cc82571d436d50d 100644
--- a/assembler/assembly-label.h
+++ b/assembler/assembly-label.h
@@ -17,7 +17,6 @@
 #define PANDA_ASSEMBLER_ASSEMBLY_LABEL_H_
 
 #include <string>
-#include <optional>
 #include "assembly-file-location.h"
 
 namespace panda::pandasm {
diff --git a/assembler/assembly-literals.h b/assembler/assembly-literals.h
index d58c50a70ba122f2b50dc15560b1f091c86cab98..3b96264669d84ed07f1758e3544ad362deb2b743 100644
--- a/assembler/assembly-literals.h
+++ b/assembler/assembly-literals.h
@@ -18,7 +18,6 @@
 
 #include <string>
 #include <vector>
-#include <variant>
 
 #include "../libpandafile/literal_data_accessor.h"
 
diff --git a/assembler/assembly-record.h b/assembler/assembly-record.h
index 6e8c8a012e6affcce2e48abbe4f796626a82f55f..b1a1bae5c038c1441d39748a7b576de0e3ed51a4 100644
--- a/assembler/assembly-record.h
+++ b/assembler/assembly-record.h
@@ -22,7 +22,6 @@
 #include <vector>
 
 #include "assembly-field.h"
-#include "assembly-file-location.h"
 #include "extensions/extensions.h"
 #include "ide_helpers.h"
 
diff --git a/assembler/error.h b/assembler/error.h
index 57ca90df1607aedac708c7f34f236df600d37165..b30e717eab386aeaa34e64ac5111eaf1909dfec3 100644
--- a/assembler/error.h
+++ b/assembler/error.h
@@ -18,8 +18,6 @@
 
 #include <string>
 
-#include "define.h"
-
 namespace panda::pandasm {
 
 struct Error {
diff --git a/assembler/lexer.h b/assembler/lexer.h
index 1198dafc96ccfd3b729b9c97de58851f837f0788..bf6c6911acbb3f558b1f742c436777acb2f33bf9 100644
--- a/assembler/lexer.h
+++ b/assembler/lexer.h
@@ -108,7 +108,7 @@ private:
     void LexPreprocess();
     void SkipSpace();
     void AnalyzeLine();
-    Token::Type LexGetType(size_t, size_t) const;
+    Token::Type LexGetType(size_t beg, size_t end) const;
 };
 
 /*
diff --git a/assembler/tests/mangling_tests.cpp b/assembler/tests/mangling_tests.cpp
index 0fe056bff8b6cea8f3b94308f69aa715f28fc440..6ecb5d3c5cae8496faf81b34b5836b5eccc09a63 100644
--- a/assembler/tests/mangling_tests.cpp
+++ b/assembler/tests/mangling_tests.cpp
@@ -14,8 +14,6 @@
  */
 
 #include <gtest/gtest.h>
-#include <iostream>
-#include <string>
 #include "mangling.h"
 #include "assembly-function.h"
 #include "extensions/extensions.h"
@@ -44,4 +42,4 @@ TEST(mangling_tests, DeMangleFunctionName)
     ASSERT_EQ(DeMangleName(name), "Asm.main");
 }
 
-}  // namespace panda::test
\ No newline at end of file
+}  // namespace panda::test
diff --git a/disassembler/accumulators.h b/disassembler/accumulators.h
index 1c84bd955e245e695646d9cf97dfada960074ada..13f83a2d774718d1fe2d1d828a3d09de42ac87b5 100644
--- a/disassembler/accumulators.h
+++ b/disassembler/accumulators.h
@@ -19,7 +19,6 @@
 #include <map>
 #include <string>
 #include <vector>
-#include <utility>
 
 namespace panda::disasm {
 using LabelTable = std::map<size_t, std::string>;
diff --git a/disassembler/disasm.cpp b/disassembler/disasm.cpp
index 8eef3cdd44043b220003b72941a641deabf9a560..999fca19bb1f661c60db6bf5902b8327082aa05c 100644
--- a/disassembler/disasm.cpp
+++ b/disassembler/disasm.cpp
@@ -18,8 +18,6 @@
 #include "utils/logger.h"
 #include "utils/pandargs.h"
 
-#include <iostream>
-
 static void PrintHelp(const panda::PandArgParser &pa_parser)
 {
     std::cerr << "Usage:" << std::endl;
diff --git a/disassembler/disassembler.cpp b/disassembler/disassembler.cpp
index 6e36ee6db18b395d8cbddb04429ffe69fd910110..e21a44a64b1fe016b4b4571da80d23a9ea46b688 100644
--- a/disassembler/disassembler.cpp
+++ b/disassembler/disassembler.cpp
@@ -17,13 +17,7 @@
 #include "mangling.h"
 #include "utils/logger.h"
 
-#include <fstream>
-#include <iostream>
 #include <iomanip>
-#include <algorithm>
-#include <map>
-#include <utility>
-#include <cctype>
 
 namespace panda::disasm {
 
diff --git a/libpandabase/concepts.h b/libpandabase/concepts.h
index a445f574c0481a8c29add00a1ffcdc98bc2db3af..ba2cfb29344e6f242642bfbb641ef82401e2a7ac 100644
--- a/libpandabase/concepts.h
+++ b/libpandabase/concepts.h
@@ -16,7 +16,6 @@
 #ifndef PANDA_LIBPANDABASE_CONCEPTS_H_
 #define PANDA_LIBPANDABASE_CONCEPTS_H_
 
-#include <type_traits>
 #include <iterator>
 
 namespace panda {
diff --git a/libpandabase/os/unix/failure_retry.h b/libpandabase/os/unix/failure_retry.h
index 893780689e6de1692d0d9e0ab7d4c8bfdd493fe5..d6d398c2db9268e6982984243e2a5ce884f2dbd1 100644
--- a/libpandabase/os/unix/failure_retry.h
+++ b/libpandabase/os/unix/failure_retry.h
@@ -16,8 +16,6 @@
 #ifndef PANDA_LIBPANDABASE_OS_UNIX_FAILURE_RETRY_H_
 #define PANDA_LIBPANDABASE_OS_UNIX_FAILURE_RETRY_H_
 
-#include <unistd.h>
-
 // Mac Os' libc doesn't have this macro
 #ifndef TEMP_FAILURE_RETRY
 #define TEMP_FAILURE_RETRY(exp)                    \
diff --git a/libpandabase/os/unix/time_unix.cpp b/libpandabase/os/unix/time_unix.cpp
index 1791c0ed4f874fef599cad3ac7bb63f4fe0eb628..e20355e84e331b2d4114e912effe83c94dc548b7 100644
--- a/libpandabase/os/unix/time_unix.cpp
+++ b/libpandabase/os/unix/time_unix.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#include "time_unix.h"
 #include "time.h"  // NOLINTNEXTLINE(modernize-deprecated-headers, hicpp-deprecated-headers)
 #include <chrono>
 
diff --git a/libpandabase/os/windows/error.cpp b/libpandabase/os/windows/error.cpp
index a64946b0a8b124cf931093dc724cf018977aa917..d9f45a17ffd726916bac5bf64a83e0211f062a77 100644
--- a/libpandabase/os/windows/error.cpp
+++ b/libpandabase/os/windows/error.cpp
@@ -14,12 +14,6 @@
  */
 
 #include "os/error.h"
-#include <stdio.h>
-#include <string.h>
-
-#include <cerrno>
-
-#include <array>
 
 namespace panda::os {
 
diff --git a/libpandabase/tests/leb128_test.cpp b/libpandabase/tests/leb128_test.cpp
index a56236b8f51461fb7648680b36691f17ab1c9e75..48c201d54e0d528c4d954539cb3d086020f1afd1 100644
--- a/libpandabase/tests/leb128_test.cpp
+++ b/libpandabase/tests/leb128_test.cpp
@@ -15,12 +15,6 @@
 
 #include "utils/leb128.h"
 
-#include <cstdint>
-
-#include <limits>
-#include <sstream>
-#include <vector>
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
diff --git a/libpandabase/utils/leb128.h b/libpandabase/utils/leb128.h
index c6c14939b5fd2a8c514e1a990188a008e407df05..e7af4806050ecf700ad57ea0bbd5e34642fa5879 100644
--- a/libpandabase/utils/leb128.h
+++ b/libpandabase/utils/leb128.h
@@ -19,10 +19,7 @@
 #include "bit_helpers.h"
 #include "bit_utils.h"
 
-#include <cstddef>
-
 #include <limits>
-#include <type_traits>
 #include <tuple>
 
 namespace panda::leb128 {
diff --git a/libpandabase/utils/terminate.cpp b/libpandabase/utils/terminate.cpp
index b4c2858a90b7668b233f326e779265ddf0f35dde..69cc324a191bc8763a523670687f52a200755fc4 100644
--- a/libpandabase/utils/terminate.cpp
+++ b/libpandabase/utils/terminate.cpp
@@ -14,7 +14,6 @@
  */
 
 #include <cstring>
-#include <cstdlib>
 #include <string>
 
 namespace panda::terminate {
diff --git a/libpandafile/annotation_data_accessor.cpp b/libpandafile/annotation_data_accessor.cpp
index 09cbe544fcd2fbdf8e533bfad74a5d0404371b67..36fe1766342dd2b84b75274f6fca6518fe7a8165 100644
--- a/libpandafile/annotation_data_accessor.cpp
+++ b/libpandafile/annotation_data_accessor.cpp
@@ -15,7 +15,6 @@
 
 #include "annotation_data_accessor.h"
 #include "file_items.h"
-#include "helpers.h"
 
 namespace panda::panda_file {
 
diff --git a/libpandafile/ark_version.cpp b/libpandafile/ark_version.cpp
index 8909fd6a6a3e88d6740862bcfe7e3980d44cc856..eed4c2429e787d8d20ed59b31ad8f09f19885d41 100644
--- a/libpandafile/ark_version.cpp
+++ b/libpandafile/ark_version.cpp
@@ -13,11 +13,6 @@
  * limitations under the License.
  */
 
-#include "ark_version.h"
-
-#include <cstring>
-#include <cstdio>
-
 namespace panda::panda_file {
 
 std::string GetVersion(const std::array<uint8_t, File::VERSION_SIZE> &v)
diff --git a/libpandafile/bytecode_emitter.cpp b/libpandafile/bytecode_emitter.cpp
index c094072b0518737aee2820c214a48f6a84c87358..1c6afb4031d1a88feaebdcbdbcd21286191b917c 100644
--- a/libpandafile/bytecode_emitter.cpp
+++ b/libpandafile/bytecode_emitter.cpp
@@ -13,14 +13,9 @@
  * limitations under the License.
  */
 
-#include <algorithm>
 #include "bytecode_emitter.h"
 #include <bytecode_instruction-inl.h>
-#include <cstdarg>
-#include <limits>
-#include <list>
 #include <macros.h>
-#include <sstream>
 #include <utils/bit_utils.h>
 #include <utils/span.h>
 
diff --git a/libpandafile/class_data_accessor.cpp b/libpandafile/class_data_accessor.cpp
index 53adbcaa5276a2b00c17d7a4211a2a6681065295..f3159e2db23c030429ef2c502905d4e4d2a15a29 100644
--- a/libpandafile/class_data_accessor.cpp
+++ b/libpandafile/class_data_accessor.cpp
@@ -19,8 +19,6 @@
 #include "utils/leb128.h"
 #include "utils/utf.h"
 
-#include <cstring>
-
 namespace panda::panda_file {
 
 ClassDataAccessor::ClassDataAccessor(const File &panda_file, File::EntityId class_id)
diff --git a/libpandafile/class_data_accessor.h b/libpandafile/class_data_accessor.h
index 340052f0924aeefb1f1829e6b52b61efada8754b..db8d840779e68aa3de93fe839a59a22f6078f43f 100644
--- a/libpandafile/class_data_accessor.h
+++ b/libpandafile/class_data_accessor.h
@@ -21,8 +21,6 @@
 #include "field_data_accessor.h"
 #include "method_data_accessor.h"
 
-#include <optional>
-
 namespace panda::panda_file {
 
 // NOLINTNEXTLINE(cppcoreguidelines-special-member-functions, hicpp-special-member-functions)
diff --git a/libpandafile/code_data_accessor-inl.h b/libpandafile/code_data_accessor-inl.h
index e76c051ee0912d9b3a95421fde60f2a1c36f4d28..32a54cae305f06517ff1b1c3e04d1cb012d8e725 100644
--- a/libpandafile/code_data_accessor-inl.h
+++ b/libpandafile/code_data_accessor-inl.h
@@ -18,8 +18,6 @@
 
 #include "code_data_accessor.h"
 
-#include <cstddef>
-
 namespace panda::panda_file {
 
 template <class Callback>
diff --git a/libpandafile/code_data_accessor.cpp b/libpandafile/code_data_accessor.cpp
index 25fc0e81a6f9a278d389b7fee3f9489e9af9bb26..695aedd486da02d2710928849d26f63a4ba1aa8c 100644
--- a/libpandafile/code_data_accessor.cpp
+++ b/libpandafile/code_data_accessor.cpp
@@ -15,8 +15,6 @@
 
 #include "code_data_accessor.h"
 
-#include "helpers.h"
-
 namespace panda::panda_file {
 
 CodeDataAccessor::CatchBlock::CatchBlock(Span<const uint8_t> data)
diff --git a/libpandafile/code_data_accessor.h b/libpandafile/code_data_accessor.h
index 1c5601a2fc1ac8ca384cd23ffa91df19500568a2..e8abce4cee01d47fd027fcee73a0c6639436c775 100644
--- a/libpandafile/code_data_accessor.h
+++ b/libpandafile/code_data_accessor.h
@@ -18,8 +18,6 @@
 
 #include "file-inl.h"
 
-#include <cstdint>
-
 namespace panda::panda_file {
 
 class CodeDataAccessor {
diff --git a/libpandafile/debug_info_extractor.cpp b/libpandafile/debug_info_extractor.cpp
index 9d39683d2ef6149b2964dbc70c45a6ae5453ec45..f2bc608ffa744bd558627b1f86463bff769f946d 100644
--- a/libpandafile/debug_info_extractor.cpp
+++ b/libpandafile/debug_info_extractor.cpp
@@ -16,11 +16,7 @@
 #include "debug_info_extractor.h"
 #include "line_program_state.h"
 #include "class_data_accessor-inl.h"
-#include "code_data_accessor-inl.h"
 #include "debug_data_accessor-inl.h"
-#include "helpers.h"
-#include "method_data_accessor-inl.h"
-#include "proto_data_accessor-inl.h"
 #include "utils/utf.h"
 
 namespace panda::panda_file {
diff --git a/libpandafile/debug_info_extractor.h b/libpandafile/debug_info_extractor.h
index 4b9f3cac4a35b89724099abe772b09d458984715..74e6d1ad100be4559d309d0ee9b3ba0d15647314 100644
--- a/libpandafile/debug_info_extractor.h
+++ b/libpandafile/debug_info_extractor.h
@@ -18,7 +18,6 @@
 
 #include "file.h"
 
-#include <cstdint>
 #include <string>
 #include <vector>
 #include <list>
diff --git a/libpandafile/field_data_accessor.cpp b/libpandafile/field_data_accessor.cpp
index afaa8a34bb91bdd13c8684c161e5978ac7eaeee0..cf7fbbe5e6f3caed2d9a97558c880eb1ea1883e8 100644
--- a/libpandafile/field_data_accessor.cpp
+++ b/libpandafile/field_data_accessor.cpp
@@ -18,8 +18,6 @@
 
 #include "utils/leb128.h"
 
-#include <cstdint>
-
 namespace panda::panda_file {
 
 FieldDataAccessor::FieldDataAccessor(const File &panda_file, File::EntityId field_id)
diff --git a/libpandafile/file_item_container.cpp b/libpandafile/file_item_container.cpp
index e941008b855a02bffb6642ef103b89805bfc7485..1d68a397a60e0d6e3ea120b7a34cf3d867a4794f 100644
--- a/libpandafile/file_item_container.cpp
+++ b/libpandafile/file_item_container.cpp
@@ -16,15 +16,8 @@
 #include "file_item_container.h"
 
 #include "file_format_version.h"
-#include "file-inl.h"
-#include "helpers.h"
 #include "macros.h"
 
-#include <cstddef>
-
-#include <iomanip>
-#include <vector>
-
 namespace panda::panda_file {
 
 class ItemDeduper {
diff --git a/libpandafile/file_item_container.h b/libpandafile/file_item_container.h
index 35356e9c0a8fd68431e8308e9412ab47d12920ee..e44669edebef4c5d75794ab8db74d86f7ce8339c 100644
--- a/libpandafile/file_item_container.h
+++ b/libpandafile/file_item_container.h
@@ -23,7 +23,6 @@
 #include <memory>
 #include <set>
 #include <string>
-#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
 
diff --git a/libpandafile/file_items.cpp b/libpandafile/file_items.cpp
index 7f3e3b56040c3c98ca77396c1773aeedf63903cc..5c744a8d30e4696231b614b01366fbcbf254c480 100644
--- a/libpandafile/file_items.cpp
+++ b/libpandafile/file_items.cpp
@@ -14,15 +14,12 @@
  */
 
 #include "file_items.h"
-#include "helpers.h"
 #include "macros.h"
 #include "utils/bit_utils.h"
 #include "utils/leb128.h"
 #include "utils/utf.h"
 
-#include <limits>
 #include <iomanip>
-#include <utility>
 
 namespace panda::panda_file {
 
diff --git a/libpandafile/literal_data_accessor.cpp b/libpandafile/literal_data_accessor.cpp
index 8bc3730fcc342718d534256ba93a06ef41cd3bd3..8cc27020b694a900224e388273ea9897716d5af2 100644
--- a/libpandafile/literal_data_accessor.cpp
+++ b/libpandafile/literal_data_accessor.cpp
@@ -14,7 +14,6 @@
  */
 
 #include "literal_data_accessor.h"
-#include "helpers.h"
 
 namespace panda::panda_file {
 
diff --git a/libpandafile/method_data_accessor.h b/libpandafile/method_data_accessor.h
index d8990867a206f9bafc04e21177b8148610673664..1e16c9fbed3b6c95de76317cb42a7d1fd7c92199 100644
--- a/libpandafile/method_data_accessor.h
+++ b/libpandafile/method_data_accessor.h
@@ -20,11 +20,6 @@
 #include "file_items.h"
 #include "modifiers.h"
 
-#include <cstddef>
-#include <cstdint>
-
-#include <optional>
-
 namespace panda::panda_file {
 
 // NOLINTNEXTLINE(cppcoreguidelines-special-member-functions, hicpp-special-member-functions)
diff --git a/libpandafile/proto_data_accessor-inl.h b/libpandafile/proto_data_accessor-inl.h
index a02ee2fe7d88158691ff0f59c959dc1a2b50d974..c89f6f6299f532e1eb5078e54deea260cf1b789d 100644
--- a/libpandafile/proto_data_accessor-inl.h
+++ b/libpandafile/proto_data_accessor-inl.h
@@ -21,8 +21,6 @@
 #include "file_items.h"
 #include "proto_data_accessor.h"
 
-#include <limits>
-
 namespace panda::panda_file {
 
 constexpr size_t SHORTY_ELEM_SIZE = sizeof(uint16_t);
diff --git a/libziparchive/tests/libziparchive_tests.cpp b/libziparchive/tests/libziparchive_tests.cpp
index fa57b3a2169aacc3da352d454bedb9631599f1f8..547cfe4466c768040cd1d6356ec3fb1d876be7b3 100644
--- a/libziparchive/tests/libziparchive_tests.cpp
+++ b/libziparchive/tests/libziparchive_tests.cpp
@@ -990,8 +990,6 @@ TEST(LIBZIPARCHIVE, OpenUncompressedArchiveFILE)
     ZipArchive object;  // on stack, but this is tmp obj as we will CloseArchive this.
     ZipArchiveHandle zip_archive_handler = &object;
 
-    // ZipArchiveHandle zip_archive_handler = new ZipArchive;
-
     // Delete the test archive, so it doesn't keep growing as we run this test
     remove(s_Test_archive_filename);
 
diff --git a/runtime/cframe.cpp b/runtime/cframe.cpp
index 19580de9b49dccd8a44fd37517a8a80d80ad45cd..f2044c72ec6e13b74d2213559b047df46e2bb6ed 100644
--- a/runtime/cframe.cpp
+++ b/runtime/cframe.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "runtime/include/cframe.h"
-
-#include <iomanip>
-
 #include "runtime/include/runtime.h"
 #include "runtime/include/stack_walker.h"
 
diff --git a/runtime/class_linker.cpp b/runtime/class_linker.cpp
index f79fdada4e4b283b0b01d5f3f0f3915818cf44b7..df73d2b1b897aac9661a8ec12687de9c45550368 100644
--- a/runtime/class_linker.cpp
+++ b/runtime/class_linker.cpp
@@ -15,12 +15,6 @@
 
 #include "runtime/include/class_linker.h"
 
-#include <cstddef>
-#include <cstdint>
-#include <iostream>
-
-#include "include/exceptions.h"
-#include "include/language_context.h"
 #include "os/filesystem.h"
 #include "runtime/bridge/bridge.h"
 #include "runtime/class_initializer.h"
diff --git a/runtime/mem/allocator.cpp b/runtime/mem/allocator.cpp
index 03f1ba80158966b338d2289811a7e885866ccea7..11285efdbe08ba6ad8ef02aea2748c33422940c6 100644
--- a/runtime/mem/allocator.cpp
+++ b/runtime/mem/allocator.cpp
@@ -28,8 +28,6 @@
 #include "runtime/mem/pygote_space_allocator-inl.h"
 #include "runtime/mem/tlab.h"
 
-#include <functional>
-
 namespace panda::mem {
 
 Allocator::~Allocator() = default;
diff --git a/runtime/mem/gc/card_table.cpp b/runtime/mem/gc/card_table.cpp
index c83ed6e10ef9d2b26da00112f0fdd66df0fe699b..eeb576564c45122e834c7f18a227e2845ac98e9a 100644
--- a/runtime/mem/gc/card_table.cpp
+++ b/runtime/mem/gc/card_table.cpp
@@ -15,8 +15,6 @@
 
 #include "runtime/mem/gc/card_table.h"
 
-#include <cstring>
-
 #include "trace/trace.h"
 #include "libpandabase/mem/mem.h"
 #include "libpandabase/utils/logger.h"
diff --git a/runtime/mem/gc/gc_stats.cpp b/runtime/mem/gc/gc_stats.cpp
index 907ebab02d42ca02f3f0162727428f5a0d446068..fee93b6838542e92ee3bc0df972450d1391b79ed 100644
--- a/runtime/mem/gc/gc_stats.cpp
+++ b/runtime/mem/gc/gc_stats.cpp
@@ -13,10 +13,6 @@
  * limitations under the License.
  */
 
-#include <algorithm>
-#include <chrono>
-#include <numeric>
-
 #include "libpandabase/utils/time.h"
 #include "libpandabase/utils/type_converter.h"
 #include "runtime/include/runtime.h"
diff --git a/runtime/mem/gc/gen-gc/gen-gc.cpp b/runtime/mem/gc/gen-gc/gen-gc.cpp
index 3422d0d4b71b981cb8cfdb8a20cb630d6a67939b..cb4fae8b78cf91db697852fe8494adcf2e05023f 100644
--- a/runtime/mem/gc/gen-gc/gen-gc.cpp
+++ b/runtime/mem/gc/gen-gc/gen-gc.cpp
@@ -14,9 +14,6 @@
  */
 
 #include "runtime/mem/gc/gen-gc/gen-gc.h"
-
-#include <functional>
-
 #include "runtime/include/hclass.h"
 #include "runtime/include/coretypes/array-inl.h"
 #include "runtime/include/mem/panda_smart_pointers.h"
diff --git a/runtime/string_table.cpp b/runtime/string_table.cpp
index 6098d369cfa66d2de3303ebebebacff74fc3b1c7..9cc8eb896816b773bd876374222083eed60e99f1 100644
--- a/runtime/string_table.cpp
+++ b/runtime/string_table.cpp
@@ -15,8 +15,6 @@
 
 #include "runtime/string_table.h"
 
-#include <mem/gc/gc.h>
-
 #include "runtime/include/runtime.h"
 #include "runtime/mem/object_helpers.h"
 
diff --git a/runtime/tests/interpreter_test.cpp b/runtime/tests/interpreter_test.cpp
index e3aa8b0dcd2bd41069212655eb8554e362e998cb..7976604d8de06cf6e7ef2bd061ab07dc0e5ba2a3 100644
--- a/runtime/tests/interpreter_test.cpp
+++ b/runtime/tests/interpreter_test.cpp
@@ -16,16 +16,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#include <algorithm>
-#include <cmath>
-#include <cstdint>
-#include <functional>
-#include <limits>
-#include <memory>
-#include <sstream>
-#include <type_traits>
-#include <vector>
-
 #include "assembly-parser.h"
 #include "libpandabase/mem/pool_manager.h"
 #include "libpandabase/utils/utf.h"
diff --git a/runtime/tests/math_helpers_test.cpp b/runtime/tests/math_helpers_test.cpp
index dc8c5e3466ea32e716de94c64a5d94162874bdf4..deac19fcfb4c3082be68cd346e34169de43c2ece 100644
--- a/runtime/tests/math_helpers_test.cpp
+++ b/runtime/tests/math_helpers_test.cpp
@@ -15,12 +15,6 @@
 
 #include <gtest/gtest.h>
 
-#include <cmath>
-#include <cstdint>
-#include <limits>
-#include <sstream>
-#include <type_traits>
-
 #include "runtime/interpreter/math_helpers.h"
 
 namespace panda::interpreter::math_helpers::test {
diff --git a/runtime/tests/mem_stats_gc_test.cpp b/runtime/tests/mem_stats_gc_test.cpp
index 23b370a8835519be1cf960f844448f8d3b66acda..441a6e62c2cc4038e04e369032db899b1481d755 100644
--- a/runtime/tests/mem_stats_gc_test.cpp
+++ b/runtime/tests/mem_stats_gc_test.cpp
@@ -13,9 +13,6 @@
  * limitations under the License.
  */
 
-#include <array>
-#include <thread>
-
 #include "gtest/gtest.h"
 #include "iostream"
 #include "runtime/class_linker_context.h"
diff --git a/runtime/time_utils.cpp b/runtime/time_utils.cpp
index a3ce1af2115575b0d254d37265b440484b74f8af..9ad53d19561db4397593afbc34e24b66be6c8923 100644
--- a/runtime/time_utils.cpp
+++ b/runtime/time_utils.cpp
@@ -15,10 +15,7 @@
 
 #include "runtime/include/time_utils.h"
 
-#include <array>
-#include <chrono>
 #include <iomanip>
-#include <sstream>
 
 #include "libpandabase/utils/time.h"
 
diff --git a/runtime/timing.cpp b/runtime/timing.cpp
index 834940b4a1d9973e5542060856036c50a78cd20b..c09fff6ee9a3dff03d8a29aab38a55d8180c3954 100644
--- a/runtime/timing.cpp
+++ b/runtime/timing.cpp
@@ -15,10 +15,7 @@
 
 #include "runtime/timing.h"
 
-#include <string>
-#include <iostream>
 #include <iomanip>
-#include <stack>
 
 #include "utils/logger.h"
 
diff --git a/verification/cflow/cflow_check.cpp b/verification/cflow/cflow_check.cpp
index d94d36743e35a1c7d8c7e194a034e20c07830d18..b5639b9230dc5b71a653feaa74bed5490795103c 100644
--- a/verification/cflow/cflow_check.cpp
+++ b/verification/cflow/cflow_check.cpp
@@ -16,8 +16,6 @@
 #include "cflow_check.h"
 #include "cflow_common.h"
 
-#include "instructions_map.h"
-
 #include "runtime/include/method-inl.h"
 
 #include "utils/logger.h"
@@ -26,9 +24,6 @@
 
 #include "verifier_messages.h"
 
-#include <optional>
-#include <iomanip>
-
 namespace panda::verifier {
 
 template <class F>
diff --git a/verification/debug/options/method_selector.h b/verification/debug/options/method_selector.h
index 571990de0e2345decdceda2a8a1c840ff706113e..7d304c9f0099b4a137c97c25360779227865fb1b 100644
--- a/verification/debug/options/method_selector.h
+++ b/verification/debug/options/method_selector.h
@@ -17,7 +17,6 @@
 #define PANDA_VERIFICATION_DEBUG_OPTIONS_METHOD_SELECTOR_H_
 
 #include <regex>
-#include <optional>
 
 template <typename Info, template <typename...> class Vector, typename Regex, typename String>
 class VerifierMethodSelector {
diff --git a/verification/job_queue/cache.cpp b/verification/job_queue/cache.cpp
index ba446164a160129835244770141924dba9da930a..ddbbad3fd4323958d47c1c2795d8e729daefa965 100644
--- a/verification/job_queue/cache.cpp
+++ b/verification/job_queue/cache.cpp
@@ -42,8 +42,6 @@
 
 #include "macros.h"
 
-#include <iostream>
-
 namespace panda::verifier {
 
 using FastAPIClassRW = CacheOfRuntimeThings::FastAPIClass<access::ReadWrite>;
diff --git a/verification/type/tests/type_system_test.cpp b/verification/type/tests/type_system_test.cpp
index 525089571b5debf93a9d10ba5b4974cd49e3b4e1..6a4885d599e9007f03e018bb1081c8004c61103d 100644
--- a/verification/type/tests/type_system_test.cpp
+++ b/verification/type/tests/type_system_test.cpp
@@ -26,8 +26,6 @@
 
 #include "runtime/include/mem/panda_string.h"
 
-#include <iostream>
-
 #include <gtest/gtest.h>
 
 namespace panda::verifier::test {
diff --git a/verification/type/type_type.h b/verification/type/type_type.h
index a5212b256e6dcc8564c13fc50f3999bd7d7b7b81..45d869deaeaec8b1d57252b56af3038794c7bd4f 100644
--- a/verification/type/type_type.h
+++ b/verification/type/type_type.h
@@ -22,8 +22,6 @@
 
 #include "type_system_kind.h"
 
-#include <type_traits>
-
 namespace panda::verifier {
 class TypeSystem;
 class TypeSet;
diff --git a/verification/util/function_traits.h b/verification/util/function_traits.h
index f8ec714eaf6d45e89eef0079d0ab0a195043e20f..52dc4c2e87298c4e9308ec39db54ad7887e0f541 100644
--- a/verification/util/function_traits.h
+++ b/verification/util/function_traits.h
@@ -16,7 +16,6 @@
 #ifndef PANDA_VERIFICATION_UTIL_FUNCTION_TRAITS_H_
 #define PANDA_VERIFICATION_UTIL_FUNCTION_TRAITS_H_
 
-#include <type_traits>
 #include <tuple>
 
 namespace panda::verifier {
diff --git a/verification/util/int_set.h b/verification/util/int_set.h
index 79b7c9ce0791837371bdcba75a241612ec9747fd..8c7bd1b8b2cd9207eed70c9dfbd9002bd4bf9578 100644
--- a/verification/util/int_set.h
+++ b/verification/util/int_set.h
@@ -19,7 +19,6 @@
 #include "bit_vector.h"
 
 #include <iterator>
-#include <functional>
 
 namespace panda::verifier {
 
diff --git a/verification/util/range.h b/verification/util/range.h
index 18565421d3f5782f009620053118b380def407ca..b4928dcc6dba4e664d5ada851304682e7b8e89f4 100644
--- a/verification/util/range.h
+++ b/verification/util/range.h
@@ -17,7 +17,6 @@
 #define PANDA_VERIFICATION_UTIL_RANGE_H_
 
 #include <limits>
-#include <type_traits>
 #include <string>
 #include <algorithm>
 #include <iterator>
diff --git a/verification/util/tests/environment.cpp b/verification/util/tests/environment.cpp
index 807dca1f453a9229c1c2ebdcff4e089016d13e0e..701f1587fb5496080615c7efc8caa7591238bbf3 100644
--- a/verification/util/tests/environment.cpp
+++ b/verification/util/tests/environment.cpp
@@ -17,8 +17,6 @@
 
 #include "verification/debug/parser/parser.h"
 
-#include <strings.h>
-#include <cstdlib>
 #include <cstring>
 
 namespace panda::verifier::test {