diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc28aec..7410f95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ target_sources(spatialaudio
         source/AmbisonicEncoderDist.cpp
         source/AmbisonicZoomer.cpp
         source/Decorrelator.cpp
-        source/adm/DirectSpeakerGainCalc.cpp
+        source/adm/DirectSpeakersGainCalc.cpp
         source/Renderer.cpp
         source/adm/AllocentricPannerGainCalc.cpp
         source/adm/AllocentricExtent.cpp
@@ -92,7 +92,7 @@ target_sources(spatialaudio
             include/adm/Conversions.h
             include/adm/MappingRules.h
             include/adm/CartesianLoudspeakerLayouts.h
-            include/adm/DirectSpeakerGainCalc.h
+            include/adm/DirectSpeakersGainCalc.h
             include/RendererMetadata.h
             include/Renderer.h
             include/adm/AllocentricPannerGainCalc.h
diff --git a/include/AmbisonicAllRAD.h b/include/AmbisonicAllRAD.h
index c2e58bc..55ed973 100644
--- a/include/AmbisonicAllRAD.h
+++ b/include/AmbisonicAllRAD.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_ALLRAD_H
-#define _AMBISONIC_ALLRAD_H
+#ifndef SPATIALAUDIO_AMBISONIC_ALLRAD_H
+#define SPATIALAUDIO_AMBISONIC_ALLRAD_H
 
 #include <string>
 #include "SpatialaudioAPI.h"
@@ -97,4 +97,4 @@ namespace spaudio {
     };
 } // namespace spaudio
 
-#endif // _AMBISONIC_ALLRAD_H
+#endif // SPATIALAUDIO_AMBISONIC_ALLRAD_H
diff --git a/include/AmbisonicBase.h b/include/AmbisonicBase.h
index b4e2db4..5b198e3 100644
--- a/include/AmbisonicBase.h
+++ b/include/AmbisonicBase.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_BASE_H
-#define    _AMBISONIC_BASE_H
+#ifndef SPATIALAUDIO_AMBISONIC_BASE_H
+#define SPATIALAUDIO_AMBISONIC_BASE_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicCommons.h"
@@ -77,4 +77,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif //_AMBISONIC_BASE_H
+#endif // SPATIALAUDIO_AMBISONIC_BASE_H
diff --git a/include/AmbisonicBinauralizer.h b/include/AmbisonicBinauralizer.h
index deff1c4..055c61d 100644
--- a/include/AmbisonicBinauralizer.h
+++ b/include/AmbisonicBinauralizer.h
@@ -14,8 +14,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_BINAURALIZER_H
-#define _AMBISONIC_BINAURALIZER_H
+#ifndef SPATIALAUDIO_AMBISONIC_BINAURALIZER_H
+#define SPATIALAUDIO_AMBISONIC_BINAURALIZER_H
 
 #include <string>
 #include <vector>
@@ -26,8 +26,7 @@
 #include "AmbisonicEncoder.h"
 #include "kiss_fft/kiss_fftr.h"
 
-#include "hrtf/mit_hrtf.h"
-#include "hrtf/sofa_hrtf.h"
+#include "hrtf/hrtf.h"
 
 namespace spaudio {
 
@@ -115,4 +114,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_BINAURALIZER_H
+#endif // SPATIALAUDIO_AMBISONIC_BINAURALIZER_H
diff --git a/include/AmbisonicCommons.h b/include/AmbisonicCommons.h
index d10ffca..8e201df 100644
--- a/include/AmbisonicCommons.h
+++ b/include/AmbisonicCommons.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONICCOMMONS_H
-#define    _AMBISONICCOMMONS_H
+#ifndef SPATIALAUDIO_AMBISONIC_COMMONS_H
+#define SPATIALAUDIO_AMBISONIC_COMMONS_H
 
 #define _USE_MATH_DEFINES
 #include <math.h>
@@ -143,4 +143,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif //_AMBISONICCOMMONS_H
+#endif // SPATIALAUDIO_AMBISONIC_COMMONS_H
diff --git a/include/AmbisonicDecoder.h b/include/AmbisonicDecoder.h
index 3c49f4d..1a476ca 100644
--- a/include/AmbisonicDecoder.h
+++ b/include/AmbisonicDecoder.h
@@ -14,8 +14,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_DECODER_H
-#define _AMBISONIC_DECODER_H
+#ifndef SPATIALAUDIO_AMBISONIC_DECODER_H
+#define SPATIALAUDIO_AMBISONIC_DECODER_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -186,4 +186,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_DECODER_H
+#endif // SPATIALAUDIO_AMBISONIC_DECODER_H
diff --git a/include/AmbisonicEncoder.h b/include/AmbisonicEncoder.h
index 1713514..87553af 100644
--- a/include/AmbisonicEncoder.h
+++ b/include/AmbisonicEncoder.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_ENCODER_H
-#define _AMBISONIC_ENCODER_H
+#ifndef SPATIALAUDIO_AMBISONIC_ENCODER_H
+#define SPATIALAUDIO_AMBISONIC_ENCODER_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicSource.h"
@@ -91,4 +91,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_ENCODER_H
+#endif // SPATIALAUDIO_AMBISONIC_ENCODER_H
diff --git a/include/AmbisonicEncoderDist.h b/include/AmbisonicEncoderDist.h
index 0f51b59..cac82d4 100644
--- a/include/AmbisonicEncoderDist.h
+++ b/include/AmbisonicEncoderDist.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_ENCODER_DIST_H
-#define _AMBISONIC_ENCODER_DIST_H
+#ifndef SPATIALAUDIO_AMBISONIC_ENCODER_DIST_H
+#define SPATIALAUDIO_AMBISONIC_ENCODER_DIST_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicEncoder.h"
@@ -87,4 +87,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_ENCODER_DIST_H
+#endif // SPATIALAUDIO_AMBISONIC_ENCODER_DIST_H
diff --git a/include/AmbisonicMicrophone.h b/include/AmbisonicMicrophone.h
index 6b5c64e..3516418 100644
--- a/include/AmbisonicMicrophone.h
+++ b/include/AmbisonicMicrophone.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_MICROPHONE_H
-#define _AMBISONIC_MICROPHONE_H
+#ifndef SPATIALAUDIO_AMBISONIC_MICROPHONE_H
+#define SPATIALAUDIO_AMBISONIC_MICROPHONE_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicSource.h"
@@ -59,4 +59,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_MICROPHONE_H
+#endif // SPATIALAUDIO_AMBISONIC_MICROPHONE_H
diff --git a/include/AmbisonicOptimFilters.h b/include/AmbisonicOptimFilters.h
index 5549147..faa4527 100644
--- a/include/AmbisonicOptimFilters.h
+++ b/include/AmbisonicOptimFilters.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_OPTIM_FILTERS_H
-#define    _AMBISONIC_OPTIM_FILTERS_H
+#ifndef SPATIALAUDIO_AMBISONIC_OPTIM_FILTERS_H
+#define SPATIALAUDIO_AMBISONIC_OPTIM_FILTERS_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -84,4 +84,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_OPTIM_FILTERS_H
+#endif // SPATIALAUDIO_AMBISONIC_OPTIM_FILTERS_H
diff --git a/include/AmbisonicProcessor.h b/include/AmbisonicProcessor.h
index c4db9e4..15d3ff8 100644
--- a/include/AmbisonicProcessor.h
+++ b/include/AmbisonicProcessor.h
@@ -14,8 +14,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_PROCESSOR_H
-#define    _AMBISONIC_PROCESSOR_H
+#ifndef SPATIALAUDIO_AMBISONIC_PROCESSOR_H
+#define SPATIALAUDIO_AMBISONIC_PROCESSOR_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -183,4 +183,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_PROCESSOR_H
+#endif // SPATIALAUDIO_AMBISONIC_PROCESSOR_H
diff --git a/include/AmbisonicRotator.h b/include/AmbisonicRotator.h
index e5a9e14..23913c7 100644
--- a/include/AmbisonicRotator.h
+++ b/include/AmbisonicRotator.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_ROTATOR_H
-#define    _AMBISONIC_ROTATOR_H
+#ifndef SPATIALAUDIO_AMBISONIC_ROTATOR_H
+#define SPATIALAUDIO_AMBISONIC_ROTATOR_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -149,4 +149,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_ROTATOR_H
+#endif // SPATIALAUDIO_AMBISONIC_ROTATOR_H
diff --git a/include/AmbisonicShelfFilters.h b/include/AmbisonicShelfFilters.h
index f81a76b..047caaa 100644
--- a/include/AmbisonicShelfFilters.h
+++ b/include/AmbisonicShelfFilters.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_SHELF_FILTERS_H
-#define    _AMBISONIC_SHELF_FILTERS_H
+#ifndef SPATIALAUDIO_AMBISONIC_SHELF_FILTERS_H
+#define SPATIALAUDIO_AMBISONIC_SHELF_FILTERS_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -80,4 +80,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_SHELF_FILTERS_H
+#endif // SPATIALAUDIO_AMBISONIC_SHELF_FILTERS_H
diff --git a/include/AmbisonicSource.h b/include/AmbisonicSource.h
index ab558da..04dd370 100644
--- a/include/AmbisonicSource.h
+++ b/include/AmbisonicSource.h
@@ -14,8 +14,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_SOURCE_H
-#define _AMBISONIC_SOURCE_H
+#ifndef SPATIALAUDIO_AMBISONIC_SOURCE_H
+#define SPATIALAUDIO_AMBISONIC_SOURCE_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -117,4 +117,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_SOURCE_H
+#endif // SPATIALAUDIO_AMBISONIC_SOURCE_H
diff --git a/include/AmbisonicSpeaker.h b/include/AmbisonicSpeaker.h
index 7cb34c1..92ea6f8 100644
--- a/include/AmbisonicSpeaker.h
+++ b/include/AmbisonicSpeaker.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_SPEAKER_H
-#define _AMBISONIC_SPEAKER_H
+#ifndef SPATIALAUDIO_AMBISONIC_SPEAKER_H
+#define SPATIALAUDIO_AMBISONIC_SPEAKER_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicSource.h"
@@ -55,4 +55,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_SPEAKER_H
+#endif // SPATIALAUDIO_AMBISONIC_SPEAKER_H
diff --git a/include/AmbisonicZoomer.h b/include/AmbisonicZoomer.h
index 93ecd0f..f277f55 100644
--- a/include/AmbisonicZoomer.h
+++ b/include/AmbisonicZoomer.h
@@ -14,8 +14,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONIC_ZOOMER_H
-#define _AMBISONIC_ZOOMER_H
+#ifndef SPATIALAUDIO_AMBISONIC_ZOOMER_H
+#define SPATIALAUDIO_AMBISONIC_ZOOMER_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -93,4 +93,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // _AMBISONIC_ZOOMER_H
+#endif // SPATIALAUDIO_AMBISONIC_ZOOMER_H
diff --git a/include/Ambisonics.h b/include/Ambisonics.h
index e59095c..29b4299 100644
--- a/include/Ambisonics.h
+++ b/include/Ambisonics.h
@@ -12,8 +12,8 @@
 /*############################################################################*/
 
 
-#ifndef _AMBISONICS_H
-#define _AMBISONICS_H
+#ifndef SPATIALAUDIO_AMBISONICS_H
+#define SPATIALAUDIO_AMBISONICS_H
 
 #include "AmbisonicCommons.h"
 #include "AmbisonicBase.h"
@@ -31,4 +31,4 @@
 #include "AmbisonicShelfFilters.h"
 #include "AmbisonicAllRAD.h"
 
-#endif //_AMBISONICS_H
+#endif // SPATIALAUDIO_AMBISONICS_H
diff --git a/include/BFormat.h b/include/BFormat.h
index bddcea0..88f6e28 100644
--- a/include/BFormat.h
+++ b/include/BFormat.h
@@ -13,8 +13,8 @@
 /*############################################################################*/
 
 
-#ifndef _BFORMAT_H
-#define _BFORMAT_H
+#ifndef SPATIALAUDIO_BFORMAT_H
+#define SPATIALAUDIO_BFORMAT_H
 
 #include "SpatialaudioAPI.h"
 #include "AmbisonicBase.h"
@@ -133,4 +133,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif //_BFORMAT_H
+#endif // SPATIALAUDIO_BFORMAT_H
diff --git a/include/Coordinates.h b/include/Coordinates.h
index 09b3189..a49cdce 100644
--- a/include/Coordinates.h
+++ b/include/Coordinates.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_COORDINATES_H
+#define SPATIALAUDIO_COORDINATES_H
 
 namespace spaudio {
 
@@ -54,3 +55,5 @@ namespace spaudio {
     }
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_COORDINATES_H
diff --git a/include/Decorrelator.h b/include/Decorrelator.h
index c75b80f..ea08572 100644
--- a/include/Decorrelator.h
+++ b/include/Decorrelator.h
@@ -10,7 +10,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_DECORRELATOR_H
+#define SPATIALAUDIO_DECORRELATOR_H
 
 #include "SpatialaudioAPI.h"
 #include "LoudspeakerLayouts.h"
@@ -117,3 +118,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_DECORRELATOR_H
diff --git a/include/GainInterp.h b/include/GainInterp.h
index 3c4a989..f3abb50 100644
--- a/include/GainInterp.h
+++ b/include/GainInterp.h
@@ -10,7 +10,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_GAIN_INTERP_H
+#define SPATIALAUDIO_GAIN_INTERP_H
 
 #include <vector>
 #include "SpatialaudioAPI.h"
@@ -81,3 +82,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_GAIN_INTERP_H
diff --git a/include/LoudspeakerLayouts.h b/include/LoudspeakerLayouts.h
index bddf602..cb34198 100644
--- a/include/LoudspeakerLayouts.h
+++ b/include/LoudspeakerLayouts.h
@@ -12,8 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-
-#pragma once
+#ifndef SPATIALAUDIO_LOUDSPEAKER_LAYOUTS_H
+#define SPATIALAUDIO_LOUDSPEAKER_LAYOUTS_H
 
 #include <string>
 #include <vector>
@@ -587,3 +587,5 @@ namespace spaudio {
     }
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_LOUDSPEAKER_LAYOUTS_H
diff --git a/include/ObjectPanner.h b/include/ObjectPanner.h
index 8e435ea..79be9de 100644
--- a/include/ObjectPanner.h
+++ b/include/ObjectPanner.h
@@ -11,8 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-
-#pragma once
+#ifndef SPATIALAUDIO_OBJECT_PANNER_H
+#define SPATIALAUDIO_OBJECT_PANNER_H
 
 #include <memory>
 
@@ -94,3 +94,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_OBJECT_PANNER_H
diff --git a/include/PointSourcePannerGainCalc.h b/include/PointSourcePannerGainCalc.h
index 60cfd29..2eefaf4 100644
--- a/include/PointSourcePannerGainCalc.h
+++ b/include/PointSourcePannerGainCalc.h
@@ -12,7 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_POINT_SOURCE_PANNER_GAIN_CALC_H
+#define SPATIALAUDIO_POINT_SOURCE_PANNER_GAIN_CALC_H
 
 #include "SpatialaudioAPI.h"
 #include "LoudspeakerLayouts.h"
@@ -104,3 +105,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_POINT_SOURCE_PANNER_GAIN_CALC_H
diff --git a/include/RegionHandlers.h b/include/RegionHandlers.h
index 991e92a..d6094fe 100644
--- a/include/RegionHandlers.h
+++ b/include/RegionHandlers.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_REGION_HANDLERS_H
+#define SPATIALAUDIO_REGION_HANDLERS_H
 
 #include "Tools.h"
 #include "SpatialaudioAPI.h"
@@ -144,3 +145,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_REGION_HANDLERS_H
diff --git a/include/Renderer.h b/include/Renderer.h
index d376c4e..b7fd161 100644
--- a/include/Renderer.h
+++ b/include/Renderer.h
@@ -12,7 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_RENDERER_H
+#define SPATIALAUDIO_RENDERER_H
 
 #include <vector>
 #include <string>
@@ -23,7 +24,7 @@
 #include "Tools.h"
 #include "adm/Conversions.h"
 #include "GainInterp.h"
-#include "adm/DirectSpeakerGainCalc.h"
+#include "adm/DirectSpeakersGainCalc.h"
 #include "Decorrelator.h"
 #include "adm/GainCalculator.h"
 
@@ -239,3 +240,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_RENDERER_H
diff --git a/include/RendererMetadata.h b/include/RendererMetadata.h
index c0c0b55..1a0ed7b 100644
--- a/include/RendererMetadata.h
+++ b/include/RendererMetadata.h
@@ -12,7 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_RENDERER_METADATA_H
+#define SPATIALAUDIO_RENDERER_METADATA_H
 
 #include <vector>
 #include <string>
@@ -489,3 +490,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_RENDERER_METADATA_H
diff --git a/include/Screen.h b/include/Screen.h
index 9e55d12..cfa29bb 100644
--- a/include/Screen.h
+++ b/include/Screen.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_SCREEN_H
+#define SPATIALAUDIO_SCREEN_H
 
 #include "SpatialaudioAPI.h"
 #include "adm/Conversions.h"
@@ -90,3 +91,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_SCREEN_H
diff --git a/include/ScreenCommon.h b/include/ScreenCommon.h
index ae3cd86..bc6b48e 100644
--- a/include/ScreenCommon.h
+++ b/include/ScreenCommon.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_SCREEN_COMMON_H
+#define SPATIALAUDIO_SCREEN_COMMON_H
 
 #include "Coordinates.h"
 #include "Tools.h"
@@ -91,3 +92,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_SCREEN_COMMON_H
diff --git a/include/SpeakersBinauralizer.h b/include/SpeakersBinauralizer.h
index dd80f36..c1090b6 100644
--- a/include/SpeakersBinauralizer.h
+++ b/include/SpeakersBinauralizer.h
@@ -1,5 +1,5 @@
-#ifndef BINAURALIZER_H
-#define BINAURALIZER_H
+#ifndef SPATIALAUDIO_BINAURALIZER_H
+#define SPATIALAUDIO_BINAURALIZER_H
 
 #include <vector>
 
@@ -59,4 +59,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // BINAURALIZER_H
+#endif // SPATIALAUDIO_BINAURALIZER_H
diff --git a/include/Tools.h b/include/Tools.h
index 4650393..c91ee66 100644
--- a/include/Tools.h
+++ b/include/Tools.h
@@ -12,7 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_TOOLS_H
+#define SPATIALAUDIO_TOOLS_H
 
 #define _USE_MATH_DEFINES
 #include<math.h>
@@ -523,3 +524,5 @@ namespace spaudio {
     }
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_TOOLS_H
diff --git a/include/adm/AllocentricExtent.h b/include/adm/AllocentricExtent.h
index 3096e80..c927332 100644
--- a/include/adm/AllocentricExtent.h
+++ b/include/adm/AllocentricExtent.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_ALLOCENTRIC_EXTENT_H
+#define SPATIALAUDIO_ADM_ALLOCENTRIC_EXTENT_H
 
 #include "../SpatialaudioAPI.h"
 #include "../LoudspeakerLayouts.h"
@@ -118,3 +119,5 @@ namespace spaudio {
 
     } // namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_ALLOCENTRIC_EXTENT_H
diff --git a/include/adm/AllocentricPannerGainCalc.h b/include/adm/AllocentricPannerGainCalc.h
index 194e9a6..e46f2d5 100644
--- a/include/adm/AllocentricPannerGainCalc.h
+++ b/include/adm/AllocentricPannerGainCalc.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_ALLOCENTRIC_PANNER_GAIN_CALC_H
+#define SPATIALAUDIO_ADM_ALLOCENTRIC_PANNER_GAIN_CALC_H
 
 #include "../SpatialaudioAPI.h"
 #include "../LoudspeakerLayouts.h"
@@ -78,3 +79,5 @@ namespace spaudio {
 
     } // namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_ALLOCENTRIC_PANNER_GAIN_CALC_H
diff --git a/include/adm/CartesianLoudspeakerLayouts.h b/include/adm/CartesianLoudspeakerLayouts.h
index 42723ed..ae45fd8 100644
--- a/include/adm/CartesianLoudspeakerLayouts.h
+++ b/include/adm/CartesianLoudspeakerLayouts.h
@@ -12,7 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_CARTESIAN_LOUDSPEAKER_LAYOUTS_H
+#define SPATIALAUDIO_ADM_CARTESIAN_LOUDSPEAKER_LAYOUTS_H
 
 namespace spaudio {
     namespace adm {
@@ -200,3 +201,5 @@ namespace spaudio {
 
     }//namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_CARTESIAN_LOUDSPEAKER_LAYOUTS_H
diff --git a/include/adm/Conversions.h b/include/adm/Conversions.h
index 0581794..ce232e8 100644
--- a/include/adm/Conversions.h
+++ b/include/adm/Conversions.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_CONVERSIONS_H
+#define SPATIALAUDIO_ADM_CONVERSIONS_H
 
 #include "../Tools.h"
 #include "../RendererMetadata.h"
@@ -482,3 +483,5 @@ namespace spaudio {
         }
     } // namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_CONVERSIONS_H
diff --git a/include/adm/DirectSpeakerGainCalc.h b/include/adm/DirectSpeakersGainCalc.h
similarity index 95%
rename from include/adm/DirectSpeakerGainCalc.h
rename to include/adm/DirectSpeakersGainCalc.h
index a250b67..62fef8f 100644
--- a/include/adm/DirectSpeakerGainCalc.h
+++ b/include/adm/DirectSpeakersGainCalc.h
@@ -12,7 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_DIRECT_SPEAKER_GAIN_CALC_H
+#define SPATIALAUDIO_ADM_DIRECT_SPEAKER_GAIN_CALC_H
 
 #include "../SpatialaudioAPI.h"
 #include "../RendererMetadata.h"
@@ -73,3 +74,5 @@ namespace spaudio {
 
     } // namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_DIRECT_SPEAKER_GAIN_CALC_H
diff --git a/include/adm/GainCalculator.h b/include/adm/GainCalculator.h
index aab4b43..a1cfa48 100644
--- a/include/adm/GainCalculator.h
+++ b/include/adm/GainCalculator.h
@@ -10,7 +10,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_GAIN_CALCULATOR_H
+#define SPATIALAUDIO_ADM_GAIN_CALCULATOR_H
 
 #include "../SpatialaudioAPI.h"
 #include "../Coordinates.h"
@@ -213,3 +214,5 @@ namespace spaudio {
 
     } // namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_GAIN_CALCULATOR_H
diff --git a/include/adm/MappingRules.h b/include/adm/MappingRules.h
index 1e4577c..3ffedb1 100644
--- a/include/adm/MappingRules.h
+++ b/include/adm/MappingRules.h
@@ -14,7 +14,8 @@
 
 #include <cmath>
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_MAPPING_RULES_H
+#define SPATIALAUDIO_ADM_MAPPING_RULES_H
 
 namespace spaudio {
     namespace adm {
@@ -168,3 +169,5 @@ namespace spaudio {
 
     } // namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_MAPPING_RULES_H
diff --git a/include/adm/PolarExtent.h b/include/adm/PolarExtent.h
index 129994e..52e0c8a 100644
--- a/include/adm/PolarExtent.h
+++ b/include/adm/PolarExtent.h
@@ -10,7 +10,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_ADM_POLAR_EXTENT_H
+#define SPATIALAUDIO_ADM_POLAR_EXTENT_H
 
 #include "../SpatialaudioAPI.h"
 #include "../Coordinates.h"
@@ -152,3 +153,5 @@ namespace spaudio {
 
     } // namespace adm
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_ADM_POLAR_EXTENT_H
diff --git a/include/dsp/IIRFilter.h b/include/dsp/IIRFilter.h
index e8fabc9..540ff89 100644
--- a/include/dsp/IIRFilter.h
+++ b/include/dsp/IIRFilter.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_DSP_IIR_FILTER_H
+#define SPATIALAUDIO_DSP_IIR_FILTER_H
 
 #include <vector>
 
@@ -73,3 +74,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_DSP_IIR_FILTER_H
diff --git a/include/dsp/LinkwitzRileyIIR.h b/include/dsp/LinkwitzRileyIIR.h
index 32588b0..e9821a5 100644
--- a/include/dsp/LinkwitzRileyIIR.h
+++ b/include/dsp/LinkwitzRileyIIR.h
@@ -11,7 +11,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_DSP_LINKWITZ_RILEY_IIR_H
+#define SPATIALAUDIO_DSP_LINKWITZ_RILEY_IIR_H
 
 #include "../SpatialaudioAPI.h"
 #include "IIRFilter.h"
@@ -53,3 +54,5 @@ namespace spaudio {
     };
 
 } // namespace spaudio
+
+#endif // SPATIALAUDIO_DSP_LINKWITZ_RILEY_IIR_H
diff --git a/include/hrtf/hrtf.h b/include/hrtf/hrtf.h
index 9cfce96..3b1b3e0 100644
--- a/include/hrtf/hrtf.h
+++ b/include/hrtf/hrtf.h
@@ -1,5 +1,5 @@
-#ifndef HRTF_H
-#define HRTF_H
+#ifndef SPATIALAUDIO_HRTF_HRTF_H
+#define SPATIALAUDIO_HRTF_HRTF_H
 
 #include "../SpatialaudioAPI.h"
 
@@ -26,4 +26,4 @@ namespace spaudio {
 
 } // namespace spaudio
 
-#endif // HRTF_H
+#endif // SPATIALAUDIO_HRTF_HRTF_H
diff --git a/include/hrtf/mit_hrtf.h b/include/hrtf/mit_hrtf.h
index c676d05..d80daca 100644
--- a/include/hrtf/mit_hrtf.h
+++ b/include/hrtf/mit_hrtf.h
@@ -1,5 +1,5 @@
-#ifndef MIT_HRTF_H
-#define MIT_HRTF_H
+#ifndef SPATIALAUDIO_HRTF_MIT_HRTF_H
+#define SPATIALAUDIO_HRTF_MIT_HRTF_H
 
 #include "hrtf.h"
 
@@ -18,4 +18,4 @@ namespace spaudio {
 
 #endif
 
-#endif // MIT_HRTF_H
+#endif // SPATIALAUDIO_HRTF_MIT_HRTF_H
diff --git a/include/hrtf/sofa_hrtf.h b/include/hrtf/sofa_hrtf.h
index c5fa181..7bf419b 100644
--- a/include/hrtf/sofa_hrtf.h
+++ b/include/hrtf/sofa_hrtf.h
@@ -1,5 +1,5 @@
-#ifndef SOFA_HRTF_H
-#define SOFA_HRTF_H
+#ifndef SPATIALAUDIO_HRTF_SOFA_HRTF_H
+#define SPATIALAUDIO_HRTF_SOFA_HRTF_H
 
 #include "hrtf.h"
 
@@ -29,4 +29,4 @@ namespace spaudio {
 
 #endif
 
-#endif // SOFA_HRTF_H
+#endif // SPATIALAUDIO_HRTF_SOFA_HRTF_H
diff --git a/include/meson.build b/include/meson.build
index cfb7287..4962a82 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -8,7 +8,7 @@ config_h = configure_file(
 # Public header files that are installed
 spatialaudio_headers = [files(
     'adm/Conversions.h',
-    'adm/DirectSpeakerGainCalc.h',
+    'adm/DirectSpeakersGainCalc.h',
     'adm/MappingRules.h',
     'RendererMetadata.h',
     'Renderer.h',
diff --git a/source/AmbisonicBinauralizer.cpp b/source/AmbisonicBinauralizer.cpp
index c3cecfd..a260d0a 100644
--- a/source/AmbisonicBinauralizer.cpp
+++ b/source/AmbisonicBinauralizer.cpp
@@ -19,6 +19,8 @@
 #include <iostream>
 
 #include "AmbisonicBinauralizer.h"
+#include "hrtf/mit_hrtf.h"
+#include "hrtf/sofa_hrtf.h"
 
 namespace spaudio {
 
diff --git a/source/LoudspeakerLayoutHulls.h b/source/LoudspeakerLayoutHulls.h
index e681e1c..216a8b8 100644
--- a/source/LoudspeakerLayoutHulls.h
+++ b/source/LoudspeakerLayoutHulls.h
@@ -12,7 +12,8 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#pragma once
+#ifndef SPATIALAUDIO_LOUDSPEAKER_LAYOUT_HULLS_H
+#define SPATIALAUDIO_LOUDSPEAKER_LAYOUT_HULLS_H
 
 #include <vector>
 
@@ -164,3 +165,5 @@ namespace spaudio {
     {3, 7, 18, 14},{3, 14, 16, 8} };
 
 }
+
+#endif // SPATIALAUDIO_LOUDSPEAKER_LAYOUT_HULLS_H
diff --git a/source/adm/DirectSpeakerGainCalc.cpp b/source/adm/DirectSpeakersGainCalc.cpp
similarity index 99%
rename from source/adm/DirectSpeakerGainCalc.cpp
rename to source/adm/DirectSpeakersGainCalc.cpp
index efde4d3..376306c 100644
--- a/source/adm/DirectSpeakerGainCalc.cpp
+++ b/source/adm/DirectSpeakersGainCalc.cpp
@@ -12,7 +12,7 @@
 /*#                                                                          #*/
 /*############################################################################*/
 
-#include "adm/DirectSpeakerGainCalc.h"
+#include "adm/DirectSpeakersGainCalc.h"
 #include<string>
 #include <map>
 
diff --git a/source/meson.build b/source/meson.build
index 2f432d7..26d3921 100644
--- a/source/meson.build
+++ b/source/meson.build
@@ -22,7 +22,7 @@ spatialaudio_sources = files(
     'AmbisonicSpeaker.cpp',
     'AmbisonicEncoderDist.cpp',
     'AmbisonicZoomer.cpp',
-    'adm/DirectSpeakerGainCalc.cpp',
+    'adm/DirectSpeakersGainCalc.cpp',
     'Renderer.cpp',
     'adm/AllocentricPannerGainCalc.cpp',
     'adm/AllocentricExtent.cpp',