diff --git a/src/base/base_strings.c b/src/base/base_strings.c
index ab34f01a..4564ce20 100644
--- a/src/base/base_strings.c
+++ b/src/base/base_strings.c
@@ -2814,6 +2814,8 @@ str8_is_before_case_sensitive(const void *a, const void *b)
 {
   int cmp = str8_compar_case_sensitive(a, b);
   return cmp < 0;
+}
+
 //~ rjf: Basic String Hashes
 
 #if !defined(XXH_IMPLEMENTATION)
diff --git a/src/linker/lnk.c b/src/linker/lnk.c
index dbac54f8..04ff5b72 100644
--- a/src/linker/lnk.c
+++ b/src/linker/lnk.c
@@ -30,10 +30,8 @@
 
 #include "base/base_inc.h"
 #include "os/os_inc.h"
-#include "path/path.h"
 #include "hash_table.h"
 #include "coff/coff.h"
-#include "coff/coff_enum.h"
 #include "coff/coff_parse.h"
 #include "coff/coff_obj_writer.h"
 #include "coff/coff_lib_writer.h"
@@ -44,7 +42,6 @@
 #include "pe/pe_make_debug_dir.h"
 #include "codeview/codeview.h"
 #include "codeview/codeview_parse.h"
-#include "codeview/codeview_enum.h"
 #include "msf/msf.h"
 #include "msf/msf_parse.h"
 #include "pdb/pdb.h"
@@ -52,10 +49,8 @@
 
 #include "base/base_inc.c"
 #include "os/os_inc.c"
-#include "path/path.c"
 #include "hash_table.c"
 #include "coff/coff.c"
-#include "coff/coff_enum.c"
 #include "coff/coff_parse.c"
 #include "coff/coff_obj_writer.c"
 #include "coff/coff_lib_writer.c"
@@ -64,7 +59,6 @@
 #include "pe/pe_make_export_table.c"
 #include "pe/pe_make_debug_dir.c"
 #include "codeview/codeview.c"
-#include "codeview/codeview_enum.c"
 #include "codeview/codeview_parse.c"
 #include "msf/msf.c"
 #include "msf/msf_parse.c"
@@ -77,11 +71,8 @@
 
 // --- RDI ---------------------------------------------------------------------
 
-#include "rdi/rdi_overrides.h"
-#include "lib_rdi_format/rdi_format.h"
-#include "rdi/rdi.h"
-#include "lib_rdi_format/rdi_format.c"
-#include "rdi/rdi.c"
+#include "rdi/rdi_local.h"
+#include "rdi/rdi_local.c"
 
 // --- Code Base Extensions ----------------------------------------------------