diff --git a/src/raddbg/raddbg_main.cpp b/src/raddbg/raddbg_main.cpp
index 85f5830a..d9892de7 100644
--- a/src/raddbg/raddbg_main.cpp
+++ b/src/raddbg/raddbg_main.cpp
@@ -30,8 +30,8 @@
 #include "os/os_inc.h"
 #include "task_system/task_system.h"
 #include "ico/ico.h"
-#include "rdi_format_local/rdi_format_local.h"
-#include "rdi_make_local/rdi_make_local.h"
+#include "rdi_format/rdi_format_local.h"
+#include "rdi_make/rdi_make_local.h"
 #include "mdesk/mdesk.h"
 #include "hash_store/hash_store.h"
 #include "file_stream/file_stream.h"
@@ -70,8 +70,8 @@
 #include "os/os_inc.c"
 #include "task_system/task_system.c"
 #include "ico/ico.c"
-#include "rdi_format_local/rdi_format_local.c"
-#include "rdi_make_local/rdi_make_local.c"
+#include "rdi_format/rdi_format_local.c"
+#include "rdi_make/rdi_make_local.c"
 #include "mdesk/mdesk.c"
 #include "hash_store/hash_store.c"
 #include "file_stream/file_stream.c"
diff --git a/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c b/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c
index bc35b289..d0b14071 100644
--- a/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c
+++ b/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c
@@ -12,8 +12,8 @@
 //~ rjf: Includes
 
 //- rjf: [lib]
-#include "rdi_format/lib/rdi_format.h"
-#include "rdi_format/lib/rdi_format.c"
+#include "lib_rdi_format/rdi_format.h"
+#include "lib_rdi_format/rdi_format.c"
 #include "lib_rdi_format/rdi_format_parse.h"
 #include "lib_rdi_format/rdi_format_parse.c"
 #include "third_party/rad_lzb_simple/rad_lzb_simple.h"
diff --git a/src/rdi_dump/rdi_dump_main.c b/src/rdi_dump/rdi_dump_main.c
index 3764759c..20f77361 100644
--- a/src/rdi_dump/rdi_dump_main.c
+++ b/src/rdi_dump/rdi_dump_main.c
@@ -21,13 +21,13 @@
 //- rjf: [h]
 #include "base/base_inc.h"
 #include "os/os_inc.h"
-#include "rdi_format_local/rdi_format_local.h"
+#include "rdi_format/rdi_format_local.h"
 #include "rdi_dump.h"
 
 //- rjf: [c]
 #include "base/base_inc.c"
 #include "os/os_inc.c"
-#include "rdi_format_local/rdi_format_local.c"
+#include "rdi_format/rdi_format_local.c"
 #include "rdi_dump.c"
 
 ////////////////////////////////
diff --git a/src/rdi_format/rdi_format_local.c b/src/rdi_format/rdi_format_local.c
index 5b6f41be..6fae2eb3 100644
--- a/src/rdi_format/rdi_format_local.c
+++ b/src/rdi_format/rdi_format_local.c
@@ -1,8 +1,7 @@
 // Copyright (c) 2024 Epic Games Tools
 // Licensed under the MIT license (https://opensource.org/license/mit/)
 
-//#include "lib_rdi_format/rdi_format.c"
-#include "rdi_format/lib/rdi_format.c"
+#include "lib_rdi_format/rdi_format.c"
 #include "lib_rdi_format/rdi_format_parse.c"
 
 internal void
diff --git a/src/rdi_format/rdi_format_local.h b/src/rdi_format/rdi_format_local.h
index e89b41db..48f7eea3 100644
--- a/src/rdi_format/rdi_format_local.h
+++ b/src/rdi_format/rdi_format_local.h
@@ -4,8 +4,7 @@
 #ifndef RDI_FORMAT_LOCAL_H
 #define RDI_FORMAT_LOCAL_H
 
-//#include "lib_rdi_format/rdi_format.h"
-#include "rdi_format/lib/rdi_format.h"
+#include "lib_rdi_format/rdi_format.h"
 #include "lib_rdi_format/rdi_format_parse.h"
 
 internal void rdi_decompress_parsed(U8 *decompressed_data, U64 decompressed_size, RDI_Parsed *og_rdi);
diff --git a/src/rdi_from_pdb/rdi_from_pdb_main.c b/src/rdi_from_pdb/rdi_from_pdb_main.c
index b813dcc2..e3c72c9a 100644
--- a/src/rdi_from_pdb/rdi_from_pdb_main.c
+++ b/src/rdi_from_pdb/rdi_from_pdb_main.c
@@ -15,8 +15,8 @@
 //~ rjf: Includes
 
 //- rjf: [lib]
-#include "rdi_format/lib/rdi_format.h"
-#include "rdi_format/lib/rdi_format.c"
+#include "lib_rdi_format/rdi_format.h"
+#include "lib_rdi_format/rdi_format.c"
 #include "third_party/rad_lzb_simple/rad_lzb_simple.h"
 #include "third_party/rad_lzb_simple/rad_lzb_simple.c"
 
@@ -24,7 +24,7 @@
 #include "base/base_inc.h"
 #include "os/os_inc.h"
 #include "task_system/task_system.h"
-#include "rdi_make_local/rdi_make_local.h"
+#include "rdi_make/rdi_make_local.h"
 #include "coff/coff.h"
 #include "codeview/codeview.h"
 #include "codeview/codeview_stringize.h"
@@ -37,7 +37,7 @@
 #include "base/base_inc.c"
 #include "os/os_inc.c"
 #include "task_system/task_system.c"
-#include "rdi_make_local/rdi_make_local.c"
+#include "rdi_make/rdi_make_local.c"
 #include "coff/coff.c"
 #include "codeview/codeview.c"
 #include "codeview/codeview_stringize.c"
diff --git a/src/rdi_make_local/rdi_make_local.c b/src/rdi_make/rdi_make_local.c
similarity index 100%
rename from src/rdi_make_local/rdi_make_local.c
rename to src/rdi_make/rdi_make_local.c
diff --git a/src/rdi_make_local/rdi_make_local.h b/src/rdi_make/rdi_make_local.h
similarity index 100%
rename from src/rdi_make_local/rdi_make_local.h
rename to src/rdi_make/rdi_make_local.h