diff --git a/librecomp/src/cont.cpp b/librecomp/src/cont.cpp
index 0d7aec8..64daba5 100644
--- a/librecomp/src/cont.cpp
+++ b/librecomp/src/cont.cpp
@@ -1,5 +1,5 @@
 #include <ultramodern/ultramodern.hpp>
-#include "recomp_helpers.h"
+#include "helpers.h"
 
 static ultramodern::input_callbacks_t input_callbacks;
 
diff --git a/librecomp/src/files.cpp b/librecomp/src/files.cpp
index facb160..8853993 100644
--- a/librecomp/src/files.cpp
+++ b/librecomp/src/files.cpp
@@ -1,4 +1,4 @@
-#include "recomp_files.h"
+#include "files.h"
 
 constexpr std::u8string_view backup_suffix = u8".bak";
 constexpr std::u8string_view temp_suffix = u8".temp";
diff --git a/librecomp/src/overlays.cpp b/librecomp/src/overlays.cpp
index 12764cf..a447012 100644
--- a/librecomp/src/overlays.cpp
+++ b/librecomp/src/overlays.cpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "recomp.h"
-#include "recomp_overlays.h"
+#include "overlays.h"
 #include "sections.h"
 
 static recomp::overlay_section_table_data_t sections_info {};
diff --git a/librecomp/src/patch_loading.cpp b/librecomp/src/patch_loading.cpp
index e456a51..80bd0d2 100644
--- a/librecomp/src/patch_loading.cpp
+++ b/librecomp/src/patch_loading.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 #include "recomp.h"
 #include "sections.h"
-#include "recomp_overlays.h"
+#include "overlays.h"
 
 static SectionTableEntry* code_sections = nullptr;
 
diff --git a/librecomp/src/pi.cpp b/librecomp/src/pi.cpp
index 8ee7025..644ab92 100644
--- a/librecomp/src/pi.cpp
+++ b/librecomp/src/pi.cpp
@@ -5,8 +5,8 @@
 #include <string>
 #include <mutex>
 #include "recomp.h"
-#include "recomp_game.h"
-#include "recomp_files.h"
+#include "game.h"
+#include "files.h"
 #include <ultramodern/ultra64.h>
 #include <ultramodern/ultramodern.hpp>
 
diff --git a/librecomp/src/recomp.cpp b/librecomp/src/recomp.cpp
index 41ab597..f7c9c95 100644
--- a/librecomp/src/recomp.cpp
+++ b/librecomp/src/recomp.cpp
@@ -12,8 +12,8 @@
 #include <array>
 
 #include "recomp.h"
-#include "recomp_overlays.h"
-#include "recomp_game.h"
+#include "overlays.h"
+#include "game.h"
 #include "xxHash/xxh3.h"
 #include "ultramodern/ultramodern.hpp"
 #include "ultramodern/error_handling.hpp"