diff --git a/include/extern/utf8decoder.hpp b/include/extern/utf8decoder.hpp
index 25ce95ad..6f5646c6 100644
--- a/include/extern/utf8decoder.hpp
+++ b/include/extern/utf8decoder.hpp
@@ -3,6 +3,8 @@
 #ifndef EXTERN_UTF8DECODER_H
 #define EXTERN_UTF8DECODER_H
 
+#include <stdint.h>
+
 uint32_t decode(uint32_t *state, uint32_t *codep, uint8_t byte);
 
 #endif // EXTERN_UTF8DECODER_H
diff --git a/include/gfx/rgba.hpp b/include/gfx/rgba.hpp
index 359c0a9f..5c0f4f59 100644
--- a/include/gfx/rgba.hpp
+++ b/include/gfx/rgba.hpp
@@ -3,7 +3,6 @@
 #ifndef RGBDS_GFX_RGBA_HPP
 #define RGBDS_GFX_RGBA_HPP
 
-#include <cstdint>
 #include <stdint.h>
 
 struct Rgba {
diff --git a/include/itertools.hpp b/include/itertools.hpp
index 1a83dde8..601060c2 100644
--- a/include/itertools.hpp
+++ b/include/itertools.hpp
@@ -6,13 +6,6 @@
 #include <tuple>
 #include <utility>
 
-#include "platform.hpp" // __PRETTY_FUNCTION__
-
-template<typename... Ts>
-static inline void report() {
-	puts(__PRETTY_FUNCTION__);
-}
-
 template<typename T>
 class EnumSeqIterator {
 	T _value;
diff --git a/include/link/assign.hpp b/include/link/assign.hpp
index e0c665b8..841876a0 100644
--- a/include/link/assign.hpp
+++ b/include/link/assign.hpp
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Assigning all sections a place
 #ifndef RGBDS_LINK_ASSIGN_H
 #define RGBDS_LINK_ASSIGN_H
 
diff --git a/include/link/main.hpp b/include/link/main.hpp
index ea0ae3b2..e7eba9c8 100644
--- a/include/link/main.hpp
+++ b/include/link/main.hpp
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Declarations that all modules use, as well as `main` and related
 #ifndef RGBDS_LINK_MAIN_H
 #define RGBDS_LINK_MAIN_H
 
diff --git a/include/link/object.hpp b/include/link/object.hpp
index f701d3d1..67067b08 100644
--- a/include/link/object.hpp
+++ b/include/link/object.hpp
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Declarations related to processing of object (.o) files
-
 #ifndef RGBDS_LINK_OBJECT_H
 #define RGBDS_LINK_OBJECT_H
 
diff --git a/include/link/output.hpp b/include/link/output.hpp
index 6674d568..c72350ff 100644
--- a/include/link/output.hpp
+++ b/include/link/output.hpp
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Outputting the result of linking
 #ifndef RGBDS_LINK_OUTPUT_H
 #define RGBDS_LINK_OUTPUT_H
 
diff --git a/include/link/patch.hpp b/include/link/patch.hpp
index c4faceed..cf76fbb9 100644
--- a/include/link/patch.hpp
+++ b/include/link/patch.hpp
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Applying patches to SECTIONs
 #ifndef RGBDS_LINK_PATCH_H
 #define RGBDS_LINK_PATCH_H
 
diff --git a/include/link/sdas_obj.hpp b/include/link/sdas_obj.hpp
index 8067ae3c..e6610271 100644
--- a/include/link/sdas_obj.hpp
+++ b/include/link/sdas_obj.hpp
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Assigning all sections a place
 #ifndef RGBDS_LINK_SDAS_OBJ_H
 #define RGBDS_LINK_SDAS_OBJ_H
 
diff --git a/include/link/section.hpp b/include/link/section.hpp
index 5e817e62..64bae79e 100644
--- a/include/link/section.hpp
+++ b/include/link/section.hpp
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Declarations manipulating symbols
 #ifndef RGBDS_LINK_SECTION_H
 #define RGBDS_LINK_SECTION_H
 
diff --git a/include/link/symbol.hpp b/include/link/symbol.hpp
index 5a1fc541..c5e5275f 100644
--- a/include/link/symbol.hpp
+++ b/include/link/symbol.hpp
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Declarations manipulating symbols
 #ifndef RGBDS_LINK_SYMBOL_H
 #define RGBDS_LINK_SYMBOL_H
 
diff --git a/include/platform.hpp b/include/platform.hpp
index 381234a6..3937279a 100644
--- a/include/platform.hpp
+++ b/include/platform.hpp
@@ -22,15 +22,6 @@
 	#define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
 
-// gcc has __PRETTY_FUNCTION__, MSVC has __FUNCSIG__, __func__ is standard
-#ifndef __PRETTY_FUNCTION__
-	#ifdef __FUNCSIG__
-		#define __PRETTY_FUNCTION__ __FUNCSIG__
-	#else
-		#define __PRETTY_FUNCTION__ __func__
-	#endif
-#endif
-
 // MSVC doesn't use POSIX types or defines for `read`
 #ifdef _MSC_VER
 	#include <io.h>
diff --git a/src/asm/charmap.cpp b/src/asm/charmap.cpp
index 16656c5f..2dea7aef 100644
--- a/src/asm/charmap.cpp
+++ b/src/asm/charmap.cpp
@@ -5,12 +5,10 @@
 #include <errno.h>
 #include <map>
 #include <stack>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
-#include <vector>
 
 #include "util.hpp"
 
diff --git a/src/asm/fixpoint.cpp b/src/asm/fixpoint.cpp
index 98962b64..cf713d17 100644
--- a/src/asm/fixpoint.cpp
+++ b/src/asm/fixpoint.cpp
@@ -4,9 +4,7 @@
 
 #include "asm/fixpoint.hpp"
 
-#include <inttypes.h>
 #include <math.h>
-#include <stdint.h>
 
 #include "asm/symbol.hpp"
 #include "asm/warning.hpp"
diff --git a/src/asm/format.cpp b/src/asm/format.cpp
index b966a4f5..bd59bd60 100644
--- a/src/asm/format.cpp
+++ b/src/asm/format.cpp
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include <inttypes.h>
 #include <math.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/asm/fstack.cpp b/src/asm/fstack.cpp
index 25874f6d..6ccc1720 100644
--- a/src/asm/fstack.cpp
+++ b/src/asm/fstack.cpp
@@ -8,13 +8,8 @@
 #include <new>
 #include <optional>
 #include <stack>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string>
 #include <string_view>
-#include <variant>
-#include <vector>
 
 #include "error.hpp"
 #include "platform.hpp" // S_ISDIR (stat macro)
diff --git a/src/asm/lexer.cpp b/src/asm/lexer.cpp
index 0137f791..1b1a45fb 100644
--- a/src/asm/lexer.cpp
+++ b/src/asm/lexer.cpp
@@ -11,20 +11,15 @@
 #include <limits.h>
 #include <math.h>
 #include <new>
-#include <optional>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 #include <unordered_map>
-#include <variant>
-#include <vector>
 #ifndef _MSC_VER
 	#include <unistd.h>
 #endif
 
-#include "platform.hpp" // For `ssize_t` and `AT`
 #include "util.hpp"
 
 #include "asm/fixpoint.hpp"
diff --git a/src/asm/macro.cpp b/src/asm/macro.cpp
index aaa41e49..eda6250a 100644
--- a/src/asm/macro.cpp
+++ b/src/asm/macro.cpp
@@ -6,11 +6,7 @@
 #include <inttypes.h>
 #include <new>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <vector>
-
-#include "asm/warning.hpp"
 
 #define MAXMACROARGS 99999
 
diff --git a/src/asm/main.cpp b/src/asm/main.cpp
index a48af57c..01eca30b 100644
--- a/src/asm/main.cpp
+++ b/src/asm/main.cpp
@@ -9,16 +9,12 @@
 #include <limits.h>
 #include <math.h>
 #include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 #include <time.h>
 
 #include "error.hpp"
 #include "extern/getopt.hpp"
-#include "helpers.hpp"
 #include "parser.hpp"
 #include "version.hpp"
 
diff --git a/src/asm/opt.cpp b/src/asm/opt.cpp
index c7d1c0d8..fd604b19 100644
--- a/src/asm/opt.cpp
+++ b/src/asm/opt.cpp
@@ -3,7 +3,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stack>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/asm/output.cpp b/src/asm/output.cpp
index f6262abb..2d3499cb 100644
--- a/src/asm/output.cpp
+++ b/src/asm/output.cpp
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Outputs an objectfile
-
 #include "asm/output.hpp"
 
 #include <algorithm>
@@ -9,7 +7,6 @@
 #include <deque>
 #include <errno.h>
 #include <inttypes.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,7 +14,6 @@
 #include <vector>
 
 #include "error.hpp"
-#include "linkdefs.hpp"
 
 #include "asm/charmap.hpp"
 #include "asm/fstack.hpp"
diff --git a/src/asm/rpn.cpp b/src/asm/rpn.cpp
index 0e1e07df..9011cc9d 100644
--- a/src/asm/rpn.cpp
+++ b/src/asm/rpn.cpp
@@ -1,7 +1,5 @@
 /* SPDX-License-Identifier: MIT */
 
-// Controls RPN expressions for objectfiles
-
 #include "asm/rpn.hpp"
 
 #include <assert.h>
@@ -9,11 +7,9 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <new>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <vector>
 
 #include "opmath.hpp"
 
diff --git a/src/asm/section.cpp b/src/asm/section.cpp
index 83ff1c76..6526bf91 100644
--- a/src/asm/section.cpp
+++ b/src/asm/section.cpp
@@ -4,7 +4,6 @@
 
 #include <algorithm>
 #include <assert.h>
-#include <deque>
 #include <errno.h>
 #include <inttypes.h>
 #include <optional>
@@ -13,10 +12,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <string>
-#include <vector>
 
 #include "error.hpp"
-#include "linkdefs.hpp"
 
 #include "asm/fstack.hpp"
 #include "asm/main.hpp"
diff --git a/src/asm/symbol.cpp b/src/asm/symbol.cpp
index 5b2c1bde..70e7f7d2 100644
--- a/src/asm/symbol.cpp
+++ b/src/asm/symbol.cpp
@@ -8,14 +8,7 @@
 #include <limits.h>
 #include <map>
 #include <new>
-#include <optional>
-#include <stdint.h>
 #include <stdio.h>
-#include <string.h>
-#include <string>
-#include <string_view>
-#include <time.h>
-#include <variant>
 
 #include "error.hpp"
 #include "helpers.hpp"
@@ -27,7 +20,6 @@
 #include "asm/macro.hpp"
 #include "asm/main.hpp"
 #include "asm/output.hpp"
-#include "asm/section.hpp"
 #include "asm/warning.hpp"
 
 std::map<std::string, Symbol> symbols;
diff --git a/src/extern/utf8decoder.cpp b/src/extern/utf8decoder.cpp
index c509efde..3b780c93 100644
--- a/src/extern/utf8decoder.cpp
+++ b/src/extern/utf8decoder.cpp
@@ -2,7 +2,7 @@
 
 /* UTF-8 decoder: http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ */
 
-#include <stdint.h>
+#include "extern/utf8decoder.hpp"
 
 static const uint8_t utf8d[] = {
     0,  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 00..0f */
diff --git a/src/gfx/main.cpp b/src/gfx/main.cpp
index 2f9e7671..46224ac4 100644
--- a/src/gfx/main.cpp
+++ b/src/gfx/main.cpp
@@ -4,15 +4,13 @@
 
 #include <algorithm>
 #include <assert.h>
-#include <cinttypes>
-#include <cstdint>
 #include <ctype.h>
 #include <fstream>
+#include <inttypes.h>
 #include <ios>
 #include <limits>
 #include <numeric>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -27,7 +25,6 @@
 #include "gfx/pal_spec.hpp"
 #include "gfx/process.hpp"
 #include "gfx/reverse.hpp"
-#include "gfx/rgba.hpp"
 
 using namespace std::literals::string_view_literals;
 
diff --git a/src/gfx/pal_packing.cpp b/src/gfx/pal_packing.cpp
index 8d35d226..99132306 100644
--- a/src/gfx/pal_packing.cpp
+++ b/src/gfx/pal_packing.cpp
@@ -5,20 +5,16 @@
 #include <algorithm>
 #include <assert.h>
 #include <bitset>
-#include <cinttypes>
 #include <deque>
+#include <inttypes.h>
 #include <numeric>
 #include <optional>
 #include <queue>
-#include <tuple>
 #include <type_traits>
 #include <unordered_set>
-#include <vector>
 
-#include "defaultinitalloc.hpp"
 #include "helpers.hpp"
 
-#include "gfx/main.hpp"
 #include "gfx/proto_palette.hpp"
 
 using std::swap;
diff --git a/src/gfx/pal_sorting.cpp b/src/gfx/pal_sorting.cpp
index a63fbb4f..1b5237e5 100644
--- a/src/gfx/pal_sorting.cpp
+++ b/src/gfx/pal_sorting.cpp
@@ -3,8 +3,6 @@
 #include "gfx/pal_sorting.hpp"
 
 #include <algorithm>
-#include <png.h>
-#include <vector>
 
 #include "helpers.hpp"
 
diff --git a/src/gfx/pal_spec.cpp b/src/gfx/pal_spec.cpp
index abeeb6cf..909617c4 100644
--- a/src/gfx/pal_spec.cpp
+++ b/src/gfx/pal_spec.cpp
@@ -3,20 +3,19 @@
 #include "gfx/pal_spec.hpp"
 
 #include <algorithm>
-#include <cassert>
+#include <assert.h>
 #include <charconv>
-#include <cinttypes>
-#include <climits>
-#include <cstdint>
-#include <cstdio>
-#include <cstring>
 #include <fstream>
-#include <limits>
+#include <inttypes.h>
+#include <limits.h>
 #include <optional>
 #include <ostream>
+#include <stdint.h>
+#include <stdio.h>
 #include <streambuf>
-#include <string>
+#include <string.h>
 #include <string_view>
+#include <string>
 #include <tuple>
 #include <type_traits>
 #include <unordered_map>
diff --git a/src/gfx/process.cpp b/src/gfx/process.cpp
index 675a62ed..a3f5d727 100644
--- a/src/gfx/process.cpp
+++ b/src/gfx/process.cpp
@@ -4,16 +4,16 @@
 
 #include <algorithm>
 #include <assert.h>
-#include <cinttypes>
-#include <climits>
-#include <cstdio>
 #include <errno.h>
 #include <fstream>
+#include <inttypes.h>
+#include <limits.h>
 #include <memory>
 #include <optional>
 #include <png.h>
 #include <setjmp.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
 #include <tuple>
 #include <unordered_set>
diff --git a/src/gfx/proto_palette.cpp b/src/gfx/proto_palette.cpp
index 4d01d74d..258644f6 100644
--- a/src/gfx/proto_palette.cpp
+++ b/src/gfx/proto_palette.cpp
@@ -2,11 +2,7 @@
 
 #include "gfx/proto_palette.hpp"
 
-#include <algorithm>
-#include <array>
-#include <cassert>
-#include <stddef.h>
-#include <stdint.h>
+#include <assert.h>
 
 #include "helpers.hpp"
 
diff --git a/src/gfx/reverse.cpp b/src/gfx/reverse.cpp
index fab4933d..c1ebd540 100644
--- a/src/gfx/reverse.cpp
+++ b/src/gfx/reverse.cpp
@@ -5,9 +5,9 @@
 #include <algorithm>
 #include <array>
 #include <assert.h>
-#include <cinttypes>
 #include <errno.h>
 #include <fstream>
+#include <inttypes.h>
 #include <optional>
 #include <png.h>
 #include <string.h>
diff --git a/src/link/main.cpp b/src/link/main.cpp
index 4f0d733c..81a79086 100644
--- a/src/link/main.cpp
+++ b/src/link/main.cpp
@@ -7,18 +7,12 @@
 #include <inttypes.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
-#include <variant>
-#include <vector>
 
 #include "error.hpp"
 #include "extern/getopt.hpp"
 #include "itertools.hpp"
-#include "linkdefs.hpp"
 #include "platform.hpp"
 #include "script.hpp"
 #include "version.hpp"
diff --git a/src/link/output.cpp b/src/link/output.cpp
index dd32ba9e..dab2fd88 100644
--- a/src/link/output.cpp
+++ b/src/link/output.cpp
@@ -6,7 +6,6 @@
 #include <assert.h>
 #include <deque>
 #include <inttypes.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -18,7 +17,6 @@
 #include "linkdefs.hpp"
 
 #include "link/main.hpp"
-#include "link/section.hpp"
 #include "link/symbol.hpp"
 
 #define BANK_SIZE 0x4000
diff --git a/src/link/patch.cpp b/src/link/patch.cpp
index 61ce84d3..895e8bd2 100644
--- a/src/link/patch.cpp
+++ b/src/link/patch.cpp
@@ -3,7 +3,6 @@
 #include "link/patch.hpp"
 
 #include <assert.h>
-#include <deque>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -12,12 +11,10 @@
 
 #include "error.hpp"
 #include "helpers.hpp"
-#include "linkdefs.hpp"
 #include "opmath.hpp"
 #include "platform.hpp"
 
 #include "link/object.hpp"
-#include "link/section.hpp"
 #include "link/symbol.hpp"
 
 struct RPNStackEntry {
diff --git a/src/link/script.y b/src/link/script.y
index 88975a80..d6bcb77a 100644
--- a/src/link/script.y
+++ b/src/link/script.y
@@ -17,8 +17,8 @@
 	#include <array>
 	#include <assert.h>
 	#include <bit>
-	#include <cinttypes>
 	#include <fstream>
+	#include <inttypes.h>
 	#include <locale>
 	#include <stdio.h>
 	#include <string_view>
diff --git a/src/link/sdas_obj.cpp b/src/link/sdas_obj.cpp
index 5fcc9045..7084378f 100644
--- a/src/link/sdas_obj.cpp
+++ b/src/link/sdas_obj.cpp
@@ -8,12 +8,10 @@
 #include <inttypes.h>
 #include <memory>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <tuple>
 #include <variant>
-#include <vector>
 
 #include "helpers.hpp"
 #include "linkdefs.hpp"
diff --git a/src/link/section.cpp b/src/link/section.cpp
index a04e886c..cec3533f 100644
--- a/src/link/section.cpp
+++ b/src/link/section.cpp
@@ -5,15 +5,10 @@
 #include <assert.h>
 #include <inttypes.h>
 #include <map>
-#include <memory>
 #include <stdlib.h>
 #include <string.h>
-#include <string>
 
 #include "error.hpp"
-#include "linkdefs.hpp"
-
-#include "link/main.hpp"
 
 std::map<std::string, std::unique_ptr<Section>> sections;
 
diff --git a/src/link/symbol.cpp b/src/link/symbol.cpp
index 3a54f72d..32c75024 100644
--- a/src/link/symbol.cpp
+++ b/src/link/symbol.cpp
@@ -5,8 +5,6 @@
 #include <inttypes.h>
 #include <map>
 #include <stdlib.h>
-#include <string>
-#include <variant>
 
 #include "error.hpp"
 #include "helpers.hpp"