diff --git a/components/bsa/ba2dx10file.cpp b/components/bsa/ba2dx10file.cpp
index 502ca043ab..a438121d5b 100644
--- a/components/bsa/ba2dx10file.cpp
+++ b/components/bsa/ba2dx10file.cpp
@@ -24,13 +24,15 @@
 #endif
 
 #include <boost/iostreams/device/array.hpp>
-#include <components/bsa/ba2file.hpp>
-#include <components/bsa/memorystream.hpp>
+
 #include <components/esm/fourcc.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>
 
+#include "ba2file.hpp"
+#include "memorystream.hpp"
+
 namespace Bsa
 {
     BA2DX10File::BA2DX10File() {}
diff --git a/components/bsa/ba2dx10file.hpp b/components/bsa/ba2dx10file.hpp
index 5d4249365b..cd1f822179 100644
--- a/components/bsa/ba2dx10file.hpp
+++ b/components/bsa/ba2dx10file.hpp
@@ -1,5 +1,5 @@
-#ifndef BSA_BA2_DX10_FILE_H
-#define BSA_BA2_DX10_FILE_H
+#ifndef OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
+#define OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
 
 #include <list>
 #include <map>
diff --git a/components/bsa/ba2file.hpp b/components/bsa/ba2file.hpp
index 9a68d3afd0..0d51be4c0e 100644
--- a/components/bsa/ba2file.hpp
+++ b/components/bsa/ba2file.hpp
@@ -1,5 +1,5 @@
-#ifndef BSA_BA2_FILE_H
-#define BSA_BA2_FILE_H
+#ifndef OPENMW_COMPONENTS_BSA_BA2FILE_HPP
+#define OPENMW_COMPONENTS_BSA_BA2FILE_HPP
 
 #include <cstdint>
 #include <string>
diff --git a/components/bsa/ba2gnrlfile.cpp b/components/bsa/ba2gnrlfile.cpp
index 63dd3d1d50..75e7305245 100644
--- a/components/bsa/ba2gnrlfile.cpp
+++ b/components/bsa/ba2gnrlfile.cpp
@@ -22,13 +22,15 @@
 #endif
 
 #include <boost/iostreams/device/array.hpp>
-#include <components/bsa/ba2file.hpp>
-#include <components/bsa/memorystream.hpp>
+
 #include <components/esm/fourcc.hpp>
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>
 
+#include "ba2file.hpp"
+#include "memorystream.hpp"
+
 namespace Bsa
 {
     // special marker for invalid records,
diff --git a/components/bsa/ba2gnrlfile.hpp b/components/bsa/ba2gnrlfile.hpp
index 5f1f21dec9..0bc94eae0e 100644
--- a/components/bsa/ba2gnrlfile.hpp
+++ b/components/bsa/ba2gnrlfile.hpp
@@ -1,5 +1,5 @@
-#ifndef BSA_BA2_GNRL_FILE_H
-#define BSA_BA2_GNRL_FILE_H
+#ifndef OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
+#define OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
 
 #include <list>
 #include <map>
diff --git a/components/bsa/bsafile.cpp b/components/bsa/bsafile.cpp
index 03ee185e9e..948b9dac8d 100644
--- a/components/bsa/bsafile.cpp
+++ b/components/bsa/bsafile.cpp
@@ -23,15 +23,15 @@
 
 #include "bsafile.hpp"
 
-#include <components/esm/fourcc.hpp>
-#include <components/files/constrainedfilestream.hpp>
-
 #include <algorithm>
 #include <cassert>
 #include <cstring>
 #include <filesystem>
 #include <fstream>
 
+#include <components/esm/fourcc.hpp>
+#include <components/files/constrainedfilestream.hpp>
+
 using namespace Bsa;
 
 /// Error handling
diff --git a/components/bsa/bsafile.hpp b/components/bsa/bsafile.hpp
index 9e79df85a1..ad7acdad17 100644
--- a/components/bsa/bsafile.hpp
+++ b/components/bsa/bsafile.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef BSA_BSA_FILE_H
-#define BSA_BSA_FILE_H
+#ifndef OPENMW_COMPONENTS_BSA_BSAFILE_HPP
+#define OPENMW_COMPONENTS_BSA_BSAFILE_HPP
 
 #include <cstdint>
 #include <filesystem>
diff --git a/components/bsa/compressedbsafile.cpp b/components/bsa/compressedbsafile.cpp
index 14d90f5d91..8426c5965c 100644
--- a/components/bsa/compressedbsafile.cpp
+++ b/components/bsa/compressedbsafile.cpp
@@ -45,11 +45,13 @@
 #endif
 
 #include <boost/iostreams/device/array.hpp>
-#include <components/bsa/memorystream.hpp>
+
 #include <components/files/constrainedfilestream.hpp>
 #include <components/files/conversion.hpp>
 #include <components/misc/strings/lower.hpp>
 
+#include "memorystream.hpp"
+
 namespace Bsa
 {
     /// Read header information from the input source
diff --git a/components/bsa/compressedbsafile.hpp b/components/bsa/compressedbsafile.hpp
index 1179dcc00b..83620f11bc 100644
--- a/components/bsa/compressedbsafile.hpp
+++ b/components/bsa/compressedbsafile.hpp
@@ -23,8 +23,8 @@
 
  */
 
-#ifndef BSA_COMPRESSED_BSA_FILE_H
-#define BSA_COMPRESSED_BSA_FILE_H
+#ifndef OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
+#define OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
 
 #include <filesystem>
 #include <limits>
diff --git a/components/bsa/memorystream.hpp b/components/bsa/memorystream.hpp
index 5662dde8ff..945d0b33d9 100644
--- a/components/bsa/memorystream.hpp
+++ b/components/bsa/memorystream.hpp
@@ -23,13 +23,14 @@
 
  */
 
-#ifndef BSA_MEMORY_STREAM_H
-#define BSA_MEMORY_STREAM_H
+#ifndef OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
+#define OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
 
-#include <components/files/memorystream.hpp>
 #include <istream>
 #include <vector>
 
+#include <components/files/memorystream.hpp>
+
 namespace Bsa
 {
     /**