diff --git a/librecomp/include/librecomp/euc-jp.h b/librecomp/include/librecomp/euc-jp.hpp
similarity index 100%
rename from librecomp/include/librecomp/euc-jp.h
rename to librecomp/include/librecomp/euc-jp.hpp
diff --git a/librecomp/include/librecomp/recomp_files.h b/librecomp/include/librecomp/files.hpp
similarity index 100%
rename from librecomp/include/librecomp/recomp_files.h
rename to librecomp/include/librecomp/files.hpp
diff --git a/librecomp/include/librecomp/recomp_game.h b/librecomp/include/librecomp/game.hpp
similarity index 98%
rename from librecomp/include/librecomp/recomp_game.h
rename to librecomp/include/librecomp/game.hpp
index a8d5b6c..5a65997 100644
--- a/librecomp/include/librecomp/recomp_game.h
+++ b/librecomp/include/librecomp/game.hpp
@@ -5,7 +5,7 @@
 #include <filesystem>
 
 #include "recomp.h"
-#include "rsp.h"
+#include "rsp.hpp"
 #include <ultramodern/ultramodern.hpp>
 
 namespace recomp {
diff --git a/librecomp/include/librecomp/recomp_helpers.h b/librecomp/include/librecomp/helpers.hpp
similarity index 100%
rename from librecomp/include/librecomp/recomp_helpers.h
rename to librecomp/include/librecomp/helpers.hpp
diff --git a/librecomp/include/librecomp/recomp_overlays.h b/librecomp/include/librecomp/overlays.hpp
similarity index 96%
rename from librecomp/include/librecomp/recomp_overlays.h
rename to librecomp/include/librecomp/overlays.hpp
index 97c5942..5f4d48a 100644
--- a/librecomp/include/librecomp/recomp_overlays.h
+++ b/librecomp/include/librecomp/overlays.hpp
@@ -2,7 +2,7 @@
 #define __RECOMP_OVERLAYS_H__
 
 #include <cstdint>
-#include "sections.h"
+#include "sections.hpp"
 
 namespace recomp {
     struct overlay_section_table_data_t {
diff --git a/librecomp/include/librecomp/rsp.h b/librecomp/include/librecomp/rsp.hpp
similarity index 99%
rename from librecomp/include/librecomp/rsp.h
rename to librecomp/include/librecomp/rsp.hpp
index 7e1a1e4..1bc91e4 100644
--- a/librecomp/include/librecomp/rsp.h
+++ b/librecomp/include/librecomp/rsp.hpp
@@ -3,7 +3,7 @@
 
 #include <cstdio>
 
-#include "rsp_vu.h"
+#include "rsp_vu.hpp"
 #include "recomp.h"
 #include "ultramodern/ultra64.h"
 
diff --git a/librecomp/include/librecomp/rsp_vu.h b/librecomp/include/librecomp/rsp_vu.hpp
similarity index 100%
rename from librecomp/include/librecomp/rsp_vu.h
rename to librecomp/include/librecomp/rsp_vu.hpp
diff --git a/librecomp/include/librecomp/rsp_vu_impl.h b/librecomp/include/librecomp/rsp_vu_impl.hpp
similarity index 100%
rename from librecomp/include/librecomp/rsp_vu_impl.h
rename to librecomp/include/librecomp/rsp_vu_impl.hpp
diff --git a/librecomp/include/librecomp/sections.h b/librecomp/include/librecomp/sections.hpp
similarity index 100%
rename from librecomp/include/librecomp/sections.h
rename to librecomp/include/librecomp/sections.hpp
diff --git a/librecomp/src/cont.cpp b/librecomp/src/cont.cpp
index 0d7aec8..fe56c66 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.hpp"
 
 static ultramodern::input_callbacks_t input_callbacks;
 
diff --git a/librecomp/src/euc-jp.cpp b/librecomp/src/euc-jp.cpp
index dbeb2fe..cbd6ee1 100644
--- a/librecomp/src/euc-jp.cpp
+++ b/librecomp/src/euc-jp.cpp
@@ -28,7 +28,7 @@
 #include <codecvt>
 #include <string>
 #include <string_view>
-#include "euc-jp.h"
+#include "euc-jp.hpp"
 
 namespace Encoding {
     // JIS X 0201 to Unicode
diff --git a/librecomp/src/files.cpp b/librecomp/src/files.cpp
index facb160..af6f18d 100644
--- a/librecomp/src/files.cpp
+++ b/librecomp/src/files.cpp
@@ -1,4 +1,4 @@
-#include "recomp_files.h"
+#include "files.hpp"
 
 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..a75ad60 100644
--- a/librecomp/src/overlays.cpp
+++ b/librecomp/src/overlays.cpp
@@ -4,8 +4,8 @@
 #include <vector>
 
 #include "recomp.h"
-#include "recomp_overlays.h"
-#include "sections.h"
+#include "overlays.hpp"
+#include "sections.hpp"
 
 static recomp::overlay_section_table_data_t sections_info {};
 static recomp::overlays_by_index_t overlays_info {};
diff --git a/librecomp/src/patch_loading.cpp b/librecomp/src/patch_loading.cpp
index e456a51..7971878 100644
--- a/librecomp/src/patch_loading.cpp
+++ b/librecomp/src/patch_loading.cpp
@@ -2,8 +2,8 @@
 #include <algorithm>
 #include <vector>
 #include "recomp.h"
-#include "sections.h"
-#include "recomp_overlays.h"
+#include "sections.hpp"
+#include "overlays.hpp"
 
 static SectionTableEntry* code_sections = nullptr;
 
diff --git a/librecomp/src/pi.cpp b/librecomp/src/pi.cpp
index 8ee7025..65a896f 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.hpp"
+#include "files.hpp"
 #include <ultramodern/ultra64.h>
 #include <ultramodern/ultramodern.hpp>
 
diff --git a/librecomp/src/print.cpp b/librecomp/src/print.cpp
index 2e10ca4..944e9fe 100644
--- a/librecomp/src/print.cpp
+++ b/librecomp/src/print.cpp
@@ -3,7 +3,7 @@
 #include <ultramodern/ultra64.h>
 #include <ultramodern/ultramodern.hpp>
 #include "recomp.h"
-#include "euc-jp.h"
+#include "euc-jp.hpp"
 
 extern "C" void __checkHardware_msp_recomp(uint8_t * rdram, recomp_context * ctx) {
     ctx->r2 = 0;
diff --git a/librecomp/src/recomp.cpp b/librecomp/src/recomp.cpp
index 41ab597..db80bbf 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.hpp"
+#include "game.hpp"
 #include "xxHash/xxh3.h"
 #include "ultramodern/ultramodern.hpp"
 #include "ultramodern/error_handling.hpp"
diff --git a/librecomp/src/rsp.cpp b/librecomp/src/rsp.cpp
index d8df936..50bf73b 100644
--- a/librecomp/src/rsp.cpp
+++ b/librecomp/src/rsp.cpp
@@ -2,7 +2,7 @@
 #include <cstring>
 #include <cinttypes>
 
-#include "rsp.h"
+#include "rsp.hpp"
 
 static recomp::rsp::callbacks_t rsp_callbacks {};
 
diff --git a/ultramodern/include/ultramodern/rt64_layer.h b/ultramodern/include/ultramodern/rt64_layer.hpp
similarity index 100%
rename from ultramodern/include/ultramodern/rt64_layer.h
rename to ultramodern/include/ultramodern/rt64_layer.hpp
diff --git a/ultramodern/src/events.cpp b/ultramodern/src/events.cpp
index 9ca13c2..d050621 100644
--- a/ultramodern/src/events.cpp
+++ b/ultramodern/src/events.cpp
@@ -14,7 +14,7 @@
 #include "ultra64.h"
 #include "ultramodern/ultramodern.hpp"
 #include "config.hpp"
-#include "rt64_layer.h"
+#include "rt64_layer.hpp"
 #include "ultramodern/rsp.hpp"
 
 static ultramodern::events::callbacks_t events_callbacks{};
diff --git a/ultramodern/src/rt64_layer.cpp b/ultramodern/src/rt64_layer.cpp
index adc09f9..ed35245 100644
--- a/ultramodern/src/rt64_layer.cpp
+++ b/ultramodern/src/rt64_layer.cpp
@@ -3,7 +3,7 @@
 
 #define HLSL_CPU
 #include "hle/rt64_application.h"
-#include "rt64_layer.h"
+#include "rt64_layer.hpp"
 #include "rt64_render_hooks.h"
 
 ultramodern::RT64Context::~RT64Context() = default;