diff --git a/assembler/assembly-debug.h b/assembler/assembly-debug.h
index cf1f325..38eea1d 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 ea3e3ed..204f1bf 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 d58c50a..3b96264 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 6e8c8a0..b1a1bae 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 57ca90d..b30e717 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 1198daf..bf6c691 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 0fe056b..6ecb5d3 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 1c84bd9..13f83a2 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 8eef3cd..999fca1 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 6e36ee6..e21a44a 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 a445f57..ba2cfb2 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 8937806..d6d398c 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 1791c0e..e20355e 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 a64946b..d9f45a1 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 a56236b..48c201d 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 c6c1493..e7af480 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 b4c2858..69cc324 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 09cbe54..36fe176 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 8909fd6..eed4c24 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 c094072..1c6afb4 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 53adbca..f3159e2 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 340052f..db8d840 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 e76c051..32a54ca 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 25fc0e8..695aedd 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 1c5601a..e8abce4 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 9d39683..f2bc608 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 4b9f3ca..74e6d1a 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 afaa8a3..cf7fbbe 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 e941008..1d68a39 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 35356e9..e44669e 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 7f3e3b5..5c744a8 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 8bc3730..8cc2702 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 d899086..1e16c9f 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 a02ee2f..c89f6f6 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 fa57b3a..547cfe4 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 19580de..f2044c7 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 f79fdad..df73d2b 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 03f1ba8..11285ef 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 c83ed6e..eeb5765 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 907ebab..fee93b6 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 3422d0d..cb4fae8 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 6098d36..9cc8eb8 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 e3aa8b0..7976604 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 dc8c5e3..deac19f 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 23b370a..441a6e6 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 a3ce1af..9ad53d1 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 834940b..c09fff6 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 d94d367..b5639b9 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 571990d..7d304c9 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 ba44616..ddbbad3 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 5250895..6a4885d 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 a5212b2..45d869d 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 f8ec714..52dc4c2 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 79b7c9c..8c7bd1b 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 1856542..b4928dc 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 807dca1..701f158 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 {