diff --git a/include/europa/io/PakFile.h b/include/europa/io/PakFile.hpp
similarity index 96%
rename from include/europa/io/PakFile.h
rename to include/europa/io/PakFile.hpp
index 0a3bbf0..83b9d40 100644
--- a/include/europa/io/PakFile.h
+++ b/include/europa/io/PakFile.hpp
@@ -9,9 +9,8 @@
 #ifndef EUROPA_IO_PAKFILE_H
 #define EUROPA_IO_PAKFILE_H
 
-#include <europa/structs/Pak.h>
-
 #include <cstdint>
+#include <europa/structs/Pak.hpp>
 #include <vector>
 
 namespace europa::io {
diff --git a/include/europa/io/PakReader.h b/include/europa/io/PakReader.hpp
similarity index 92%
rename from include/europa/io/PakReader.h
rename to include/europa/io/PakReader.hpp
index 534bdb9..3b8cfe8 100644
--- a/include/europa/io/PakReader.h
+++ b/include/europa/io/PakReader.hpp
@@ -9,9 +9,8 @@
 #ifndef EUROPA_IO_PAKREADER_H
 #define EUROPA_IO_PAKREADER_H
 
-#include <europa/io/PakFile.h>
-#include <europa/structs/Pak.h>
-
+#include <europa/io/PakFile.hpp>
+#include <europa/structs/Pak.hpp>
 #include <iosfwd>
 #include <string>
 #include <unordered_map>
diff --git a/include/europa/io/PakWriter.h b/include/europa/io/PakWriter.hpp
similarity index 95%
rename from include/europa/io/PakWriter.h
rename to include/europa/io/PakWriter.hpp
index 9822c7b..e3cc6d1 100644
--- a/include/europa/io/PakWriter.h
+++ b/include/europa/io/PakWriter.hpp
@@ -9,8 +9,7 @@
 #ifndef EUROPA_IO_PAKWRITER_H
 #define EUROPA_IO_PAKWRITER_H
 
-#include <europa/io/PakFile.h>
-
+#include <europa/io/PakFile.hpp>
 #include <iosfwd>
 #include <string>
 #include <unordered_map>
diff --git a/include/europa/io/YatfReader.h b/include/europa/io/YatfReader.hpp
similarity index 95%
rename from include/europa/io/YatfReader.h
rename to include/europa/io/YatfReader.hpp
index 867e875..40fb2ae 100644
--- a/include/europa/io/YatfReader.h
+++ b/include/europa/io/YatfReader.hpp
@@ -9,9 +9,9 @@
 #ifndef EUROPA_IO_YATFREADER_H
 #define EUROPA_IO_YATFREADER_H
 
-#include <europa/structs/Yatf.h>
 #include <pixel/RgbaImage.h>
 
+#include <europa/structs/Yatf.hpp>
 #include <iosfwd>
 
 namespace europa::io {
diff --git a/include/europa/structs/ImHexAdapter.h b/include/europa/structs/ImHexAdapter.hpp
similarity index 100%
rename from include/europa/structs/ImHexAdapter.h
rename to include/europa/structs/ImHexAdapter.hpp
diff --git a/include/europa/structs/Pak.h b/include/europa/structs/Pak.hpp
similarity index 98%
rename from include/europa/structs/Pak.h
rename to include/europa/structs/Pak.hpp
index 5ed0b21..475fe1d 100644
--- a/include/europa/structs/Pak.h
+++ b/include/europa/structs/Pak.hpp
@@ -9,10 +9,9 @@
 #ifndef EUROPA_STRUCTS_PAK_H
 #define EUROPA_STRUCTS_PAK_H
 
-#include <europa/structs/ImHexAdapter.h>
-
 #include <cstdint>
 #include <cstring>
+#include <europa/structs/ImHexAdapter.hpp>
 
 namespace europa::structs {
 
diff --git a/include/europa/structs/Yatf.h b/include/europa/structs/Yatf.hpp
similarity index 91%
rename from include/europa/structs/Yatf.h
rename to include/europa/structs/Yatf.hpp
index 2966eaf..1a51c9f 100644
--- a/include/europa/structs/Yatf.h
+++ b/include/europa/structs/Yatf.hpp
@@ -9,9 +9,8 @@
 #ifndef EUROPA_STRUCTS_YATF_H
 #define EUROPA_STRUCTS_YATF_H
 
-#include <europa/structs/ImHexAdapter.h>
-#include <europa/util/FourCC.h>
-
+#include <europa/structs/ImHexAdapter.hpp>
+#include <europa/util/FourCC.hpp>
 #include <type_traits>
 
 namespace europa::structs {
diff --git a/include/europa/util/FixedString.h b/include/europa/util/FixedString.hpp
similarity index 100%
rename from include/europa/util/FixedString.h
rename to include/europa/util/FixedString.hpp
diff --git a/include/europa/util/FourCC.h b/include/europa/util/FourCC.hpp
similarity index 96%
rename from include/europa/util/FourCC.h
rename to include/europa/util/FourCC.hpp
index 6847ce6..1d834dc 100644
--- a/include/europa/util/FourCC.h
+++ b/include/europa/util/FourCC.hpp
@@ -9,9 +9,8 @@
 #ifndef EUROPA_FOURCC_H
 #define EUROPA_FOURCC_H
 
-#include <europa/util/FixedString.h>
-
 #include <bit>
+#include <europa/util/FixedString.hpp>
 
 namespace europa::util {
 
diff --git a/include/europa/util/TupleElement.h b/include/europa/util/TupleElement.hpp
similarity index 100%
rename from include/europa/util/TupleElement.h
rename to include/europa/util/TupleElement.hpp
diff --git a/src/libeuropa/io/PakFile.cpp b/src/libeuropa/io/PakFile.cpp
index 5adda43..28839d7 100644
--- a/src/libeuropa/io/PakFile.cpp
+++ b/src/libeuropa/io/PakFile.cpp
@@ -6,7 +6,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 //
 
-#include <europa/io/PakFile.h>
+#include <europa/io/PakFile.hpp>
 
 namespace europa::io {
 
diff --git a/src/libeuropa/io/PakReader.cpp b/src/libeuropa/io/PakReader.cpp
index ba0a531..13e9fa2 100644
--- a/src/libeuropa/io/PakReader.cpp
+++ b/src/libeuropa/io/PakReader.cpp
@@ -6,10 +6,9 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 //
 
-#include <europa/io/PakReader.h>
-#include <europa/structs/Pak.h>
-
 #include <cstring>
+#include <europa/io/PakReader.hpp>
+#include <europa/structs/Pak.hpp>
 
 #include "StreamUtils.h"
 
diff --git a/src/libeuropa/io/PakWriter.cpp b/src/libeuropa/io/PakWriter.cpp
index f62f7fa..d15a396 100644
--- a/src/libeuropa/io/PakWriter.cpp
+++ b/src/libeuropa/io/PakWriter.cpp
@@ -6,15 +6,13 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 //
 
-#include <europa/io/PakWriter.h>
-
+#include <algorithm>
+#include <europa/io/PakWriter.hpp>
+#include <europa/util/TupleElement.hpp>
 #include <iostream>
 
 #include "StreamUtils.h"
 
-#include <algorithm>
-#include <europa/util/TupleElement.h>
-
 namespace europa::io {
 
 	void PakWriter::Init(structs::PakHeader::Version version) {
diff --git a/src/libeuropa/io/YatfReader.cpp b/src/libeuropa/io/YatfReader.cpp
index 29be3bf..4943a35 100644
--- a/src/libeuropa/io/YatfReader.cpp
+++ b/src/libeuropa/io/YatfReader.cpp
@@ -6,8 +6,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 //
 
-#include <europa/io/YatfReader.h>
-
+#include <europa/io/YatfReader.hpp>
 #include <vector>
 
 #include "StreamUtils.h"
diff --git a/src/tools/europa_pack_extractor.cpp b/src/tools/europa_pack_extractor.cpp
index bbb0cb5..34c33ec 100644
--- a/src/tools/europa_pack_extractor.cpp
+++ b/src/tools/europa_pack_extractor.cpp
@@ -6,8 +6,7 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <europa/io/PakReader.h>
-
+#include <europa/io/PakReader.hpp>
 #include <filesystem>
 #include <fstream>
 #include <indicators/cursor_control.hpp>
diff --git a/src/tools/pakcreate.cpp b/src/tools/pakcreate.cpp
index 1b71bc3..508fd83 100644
--- a/src/tools/pakcreate.cpp
+++ b/src/tools/pakcreate.cpp
@@ -8,12 +8,11 @@
 
 // A test utility to regurgitate a pak.
 
-#include <europa/io/PakReader.h>
-#include <europa/io/PakWriter.h>
-
+#include <europa/io/PakReader.hpp>
+#include <europa/io/PakWriter.hpp>
+#include <filesystem>
 #include <fstream>
 #include <iostream>
-#include <filesystem>
 
 namespace fs = std::filesystem;
 
diff --git a/src/tools/paktest.cpp b/src/tools/paktest.cpp
index ba71f62..1796c54 100644
--- a/src/tools/paktest.cpp
+++ b/src/tools/paktest.cpp
@@ -8,9 +8,8 @@
 
 // A test utility to regurgitate a pak.
 
-#include <europa/io/PakReader.h>
-#include <europa/io/PakWriter.h>
-
+#include <europa/io/PakReader.hpp>
+#include <europa/io/PakWriter.hpp>
 #include <fstream>
 #include <iostream>
 
diff --git a/src/tools/texdump.cpp b/src/tools/texdump.cpp
index 0d2048d..34fdb31 100644
--- a/src/tools/texdump.cpp
+++ b/src/tools/texdump.cpp
@@ -6,9 +6,9 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <europa/io/YatfReader.h>
 #include <pixel/ImageWriter.h>
 
+#include <europa/io/YatfReader.hpp>
 #include <filesystem>
 #include <fstream>
 #include <iostream>