diff --git a/lib/grit/audio/delay/non_owning_delay_line.hpp b/lib/grit/audio/delay/non_owning_delay_line.hpp
index 12a5cb2..877139f 100644
--- a/lib/grit/audio/delay/non_owning_delay_line.hpp
+++ b/lib/grit/audio/delay/non_owning_delay_line.hpp
@@ -26,7 +26,7 @@ struct NonOwningDelayLine
     etl::size_t _delay{0};
     etl::size_t _writePos{0};
     etl::mdspan<Float, Extent> _buffer;
-    [[no_unique_address]] Interpolation _interpolator{};
+    TETL_NO_UNIQUE_ADDRESS Interpolation _interpolator{};
 };
 
 template<etl::floating_point Float, typename Extent, typename Interpolation>
diff --git a/lib/grit/audio/dynamic/dynamic.hpp b/lib/grit/audio/dynamic/dynamic.hpp
index 701d5f2..e4e580a 100644
--- a/lib/grit/audio/dynamic/dynamic.hpp
+++ b/lib/grit/audio/dynamic/dynamic.hpp
@@ -43,9 +43,9 @@ struct Dynamic
     }
 
 private:
-    [[no_unique_address]] LevelDetector _levelDetector;
-    [[no_unique_address]] GainComputer _gainComputer;
-    [[no_unique_address]] Ballistics _ballistics;
+    TETL_NO_UNIQUE_ADDRESS LevelDetector _levelDetector;
+    TETL_NO_UNIQUE_ADDRESS GainComputer _gainComputer;
+    TETL_NO_UNIQUE_ADDRESS Ballistics _ballistics;
 };
 
 }  // namespace grit
diff --git a/lib/grit/audio/waveshape/wave_shaper.hpp b/lib/grit/audio/waveshape/wave_shaper.hpp
index f3605d1..d9bd2b8 100644
--- a/lib/grit/audio/waveshape/wave_shaper.hpp
+++ b/lib/grit/audio/waveshape/wave_shaper.hpp
@@ -24,7 +24,7 @@ struct WaveShaper
     [[nodiscard]] auto operator()(Float input) const -> Float { return _function(input); }
 
 private:
-    [[no_unique_address]] Function _function;
+    TETL_NO_UNIQUE_ADDRESS Function _function;
 };
 
 }  // namespace grit
diff --git a/lib/grit/audio/waveshape/wave_shaper_adaa1.hpp b/lib/grit/audio/waveshape/wave_shaper_adaa1.hpp
index 0a277b0..e8007c1 100644
--- a/lib/grit/audio/waveshape/wave_shaper_adaa1.hpp
+++ b/lib/grit/audio/waveshape/wave_shaper_adaa1.hpp
@@ -36,7 +36,7 @@ struct WaveShaperADAA1
 
     Float _xm1{0};
     Float _ad1m1{0};
-    [[no_unique_address]] Nonlinearity _nl;
+    TETL_NO_UNIQUE_ADDRESS Nonlinearity _nl;
 };
 
 }  // namespace grit