software-mansion · SomePersonFromMars · Aug 3, 2026 · Jul 30, 2026 · Jul 31, 2026 · Jul 31, 2026
diff --git a/.claude/skills/audio-nodes/SKILL.md b/.claude/skills/audio-nodes/SKILL.md
@@ -260,7 +260,7 @@ range, the a-rate `outputBuffer_`, and the per-quantum memoization state, and ce
 clamping via `finalizeKRate` / `finalizeARate`.
 
 - **`AudioParam`** — the only JS-connectable param; owns `inputBuffer_` (BridgeNode modulation).
-- **`CompositeAudioParam<Fn>`** (`core/CompositeAudioParam.h`) — represents a spec
+- **`CompositeAudioParam<Fn>`** (`core/CompositeAudioParam.hpp`) — represents a spec
   `computedValue` (e.g. `computedOscFrequency`). `Fn` is a pure, captureless free function
   (defined in the owning node's header, next to the composite member) taking float children
   and returning float; its arity is deduced. It processes each child, folds `Fn` over them,

diff --git a/.claude/skills/build-compilation-dependencies/SKILL.md b/.claude/skills/build-compilation-dependencies/SKILL.md
@@ -54,6 +54,12 @@ react-native-audio-api/
 
 ---
 
+## C++ Header File Extensions
+
+In `common/cpp/audioapi/`: `.hpp` = header-only templates; `.h` = non-template (usually with a `.cpp`). Vendored code is excluded.
+
+---
+
 ## Prebuilt Binaries
 
 External libraries (Opus, Ogg, Vorbis, OpenSSL, FFmpeg) are **not compiled from source** — they are downloaded as prebuilt `.a` / `.so` / `.xcframework` archives from:

diff --git a/.claude/skills/thread-safety-itc/SKILL.md b/.claude/skills/thread-safety-itc/SKILL.md
@@ -69,7 +69,7 @@ oscillatorNode->scheduleAudioEvent(std::move(event));
 
 Send events from the audio thread back to JS (e.g. `ended`, `loopEnded`, `positionChanged`).
 
-**Prefer `EventCaller<AudioEvent::X>`** — a small RAII helper templated on the event type. `dispatch()` requires a payload matching `EventPayloadFor<AudioEvent::X, Payload>` (see `AudioEventPayloadMapping.h`).
+**Prefer `EventCaller<AudioEvent::X>`** — a small RAII helper templated on the event type. `dispatch()` requires a payload matching `EventPayloadFor<AudioEvent::X, Payload>` (see `AudioEventPayloadMapping.hpp`).
 
 ```cpp
 // Node member (composition — one EventCaller per event)

diff --git a/.claude/skills/utilities/SKILL.md b/.claude/skills/utilities/SKILL.md
@@ -211,7 +211,7 @@ RAII mutex wrapper that can hold `nullptr` (no-op). Supports `Locker::tryLock(mu
 
 ## `common/cpp/audioapi/dsp/` — DSP helpers
 
-### `AudioUtils.hpp` — inline DSP math
+### `AudioUtils.h` — inline DSP math
 
 Provides `timeToSampleFrame()`, `sampleFrameToTime()`, `linearInterpolate()`, `linearToDecibels()`, `decibelsToLinear()`.
 

diff --git a/.claude/skills/utilities/api.md b/.claude/skills/utilities/api.md
@@ -239,10 +239,10 @@ Used exclusively within `AudioParamEventQueue`. Do not construct outside of `Aud
 
 ---
 
-## `AudioUtils.hpp` — inline DSP math
+## `AudioUtils.h` — inline DSP math
 
 ```cpp
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 using namespace audioapi::dsp;
 
 size_t frame = timeToSampleFrame(time, sampleRate);   // double → size_t

diff --git a/.claude/skills/utilities/maintenance.md b/.claude/skills/utilities/maintenance.md
@@ -17,6 +17,6 @@ Review this skill when `pre-push-update` reports changes in:
 | `common/cpp/audioapi/utils/Benchmark.hpp` | `api.md` — function names, return type |
 | `common/cpp/audioapi/core/utils/AudioDestructor.hpp` | `api.md` — `tryAddForDeconstruction` signature, capacity |
 | `common/cpp/audioapi/core/utils/ParamChangeEvent.hpp` | `api.md` — constructor args, getters/setters |
-| `common/cpp/audioapi/dsp/AudioUtils.hpp` | `api.md` — new DSP helpers added or signatures changed |
+| `common/cpp/audioapi/dsp/AudioUtils.h` | `api.md` — new DSP helpers added or signatures changed |
 | `common/cpp/audioapi/core/utils/Constants.h` | Constants section in `SKILL.md` |
 | `src/utils/**` | TypeScript utils section in `SKILL.md` |
diff --git a/apps/fabric-example/ios/Podfile.lock b/apps/fabric-example/ios/Podfile.lock
@@ -2523,7 +2523,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   FBLazyVector: c00c20551d40126351a6783c47ce75f5b374851b
-  hermes-engine: 146211e12d60a1951d9eb0287be07211e86cf5d5
+  hermes-engine: e97e6762d8c64a63b6e1d5cd704577fdd5992f9c
   RCTDeprecation: 3bb167081b134461cfeb875ff7ae1945f8635257
   RCTRequired: 74839f55d5058a133a0bc4569b0afec750957f64
   RCTSwiftUI: 87a316382f3eab4dd13d2a0d0fd2adcce917361a
@@ -2532,7 +2532,7 @@ SPEC CHECKSUMS:
   React: 1b1536b9099195944034e65b1830f463caaa8390
   React-callinvoker: 6dff6d17d1d6cc8fdf85468a649bafed473c65f5
   React-Core: 00faa4d038298089a1d5a5b21dde8660c4f0820d
-  React-Core-prebuilt: ef40616103ee11f8c2517697c3aa4f48ce790549
+  React-Core-prebuilt: c28e62d9521adb5940a1bf6d8d31c4f70debdbe3
   React-CoreModules: a17807f849bfd86045b0b9a75ec8c19373b482f6
   React-cxxreact: c7b53ace5827be54048288bce5c55f337c41e95f
   React-debug: e1f00fcd2cef58a2897471a6d76a4ef5f5f90c74
@@ -2596,7 +2596,7 @@ SPEC CHECKSUMS:
   ReactAppDependencyProvider: 5787b37b8e2e51dfeab697ec031cc7c4080dcea2
   ReactCodegen: d07ee3c8db75b43d1cbe479ae6affebf9925c733
   ReactCommon: fe2a3af8975e63efa60f95fca8c34dc85deee360
-  ReactNativeDependencies: 54189f1570b1308686cb21564e755e1daa77ea03
+  ReactNativeDependencies: d78bc47c9d51cd25ac809534164aec0d5dcf46e9
   RNAudioAPI: bf5a0c9caaa6d553c5aaa4e0b024596dea4634f7
   RNAudioWorklets: febe470be646585d9b8b0de320a5fb8684cb012c
   RNGestureHandler: 187c5c7936abf427bc4d22d6c3b1ac80ad1f63c0

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioNodeHostObject.cpp b/packages/react-native-audio-api/common/cpp/audioapi/HostObjects/AudioNodeHostObject.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/HostObjects/AudioNodeHostObject.h>
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
 #include <audioapi/core/AudioNode.h>

diff --git a/.../audioapi/HostObjects/TypedAudioNodePtr.h → ...udioapi/HostObjects/TypedAudioNodePtr.hpp b/.../audioapi/HostObjects/TypedAudioNodePtr.h → ...udioapi/HostObjects/TypedAudioNodePtr.hpp
diff --git a/...eact-native-audio-api/common/cpp/audioapi/HostObjects/analysis/AnalyserNodeHostObject.cpp b/...eact-native-audio-api/common/cpp/audioapi/HostObjects/analysis/AnalyserNodeHostObject.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/analysis/AnalyserNodeHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/analysis/AnalyserNode.h>

diff --git a/...e-audio-api/common/cpp/audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h b/...e-audio-api/common/cpp/audioapi/HostObjects/destinations/AudioDestinationNodeHostObject.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <audioapi/HostObjects/AudioNodeHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/core/destinations/AudioDestinationNode.h>
 #include <audioapi/types/NodeOptions.h>
 

diff --git a/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/BiquadFilterNodeHostObject.cpp b/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/BiquadFilterNodeHostObject.cpp
@@ -1,5 +1,5 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/BiquadFilterNodeHostObject.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
 #include <audioapi/core/BaseAudioContext.h>

diff --git a/...-native-audio-api/common/cpp/audioapi/HostObjects/effects/ChannelMergerNodeHostObject.cpp b/...-native-audio-api/common/cpp/audioapi/HostObjects/effects/ChannelMergerNodeHostObject.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/ChannelMergerNodeHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/channel_merger/ChannelMergerInputNode.h>

diff --git a/...ative-audio-api/common/cpp/audioapi/HostObjects/effects/ChannelSplitterNodeHostObject.cpp b/...ative-audio-api/common/cpp/audioapi/HostObjects/effects/ChannelSplitterNodeHostObject.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/ChannelSplitterNodeHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/channel_splitter/ChannelSplitterInputNode.h>

diff --git a/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/ConvolverNodeHostObject.cpp b/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/ConvolverNodeHostObject.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/ConvolverNodeHostObject.h>
 #include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>

diff --git a/...es/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/DelayNodeHostObject.cpp b/...es/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/DelayNodeHostObject.cpp
@@ -1,5 +1,5 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/DelayNodeHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/DelayNode.h>

diff --git a/...ges/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/GainNodeHostObject.cpp b/...ges/react-native-audio-api/common/cpp/audioapi/HostObjects/effects/GainNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/effects/GainNodeHostObject.h>
 
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/GainNode.h>
 #include <audioapi/types/NodeOptions.h>

diff --git a/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/IIRFilterNodeHostObject.cpp b/...eact-native-audio-api/common/cpp/audioapi/HostObjects/effects/IIRFilterNodeHostObject.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/IIRFilterNodeHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/IIRFilterNode.h>

diff --git a/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/StereoPannerNodeHostObject.cpp b/...t-native-audio-api/common/cpp/audioapi/HostObjects/effects/StereoPannerNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/effects/StereoPannerNodeHostObject.h>
 
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/effects/StereoPannerNode.h>
 #include <audioapi/types/NodeOptions.h>

diff --git a/...act-native-audio-api/common/cpp/audioapi/HostObjects/effects/WaveShaperNodeHostObject.cpp b/...act-native-audio-api/common/cpp/audioapi/HostObjects/effects/WaveShaperNodeHostObject.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/WaveShaperNodeHostObject.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
 #include <audioapi/HostObjects/utils/NodeOptionsParser.h>

diff --git a/...audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.cpp b/...audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.cpp
@@ -1,5 +1,5 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/sources/AudioBufferBaseSourceNodeHostObject.h>
 #include <audioapi/core/sources/AudioBufferBaseSourceNode.h>
 #include <audioapi/core/utils/Constants.h>

diff --git a/...udio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.cpp b/...udio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/HostObjects/sources/AudioBufferQueueSourceNodeHostObject.h>
 
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/AudioBufferQueueSourceNode.h>

diff --git a/...ive-audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.cpp b/...ive-audio-api/common/cpp/audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/sources/AudioBufferSourceNodeHostObject.h>
 
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/sources/AudioBufferHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/AudioBufferSourceNode.h>

diff --git a/...ative-audio-api/common/cpp/audioapi/HostObjects/sources/AudioFileSourceNodeHostObject.cpp b/...ative-audio-api/common/cpp/audioapi/HostObjects/sources/AudioFileSourceNodeHostObject.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/HostObjects/sources/AudioFileSourceNodeHostObject.h>
 
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/sources/AudioScheduledSourceNodeHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/AudioFileSourceNode.h>

diff --git a/...-audio-api/common/cpp/audioapi/HostObjects/sources/AudioScheduledSourceNodeHostObject.cpp b/...-audio-api/common/cpp/audioapi/HostObjects/sources/AudioScheduledSourceNodeHostObject.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/sources/AudioScheduledSourceNodeHostObject.h>
 #include <audioapi/core/sources/AudioScheduledSourceNode.h>
 #include <audioapi/types/NodeOptions.h>

diff --git a/...native-audio-api/common/cpp/audioapi/HostObjects/sources/ConstantSourceNodeHostObject.cpp b/...native-audio-api/common/cpp/audioapi/HostObjects/sources/ConstantSourceNodeHostObject.cpp
@@ -1,5 +1,5 @@
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/sources/ConstantSourceNodeHostObject.h>
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/ConstantSourceNode.h>

diff --git a/...act-native-audio-api/common/cpp/audioapi/HostObjects/sources/OscillatorNodeHostObject.cpp b/...act-native-audio-api/common/cpp/audioapi/HostObjects/sources/OscillatorNodeHostObject.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/HostObjects/sources/OscillatorNodeHostObject.h>
 
 #include <audioapi/HostObjects/AudioParamHostObject.h>
-#include <audioapi/HostObjects/TypedAudioNodePtr.h>
+#include <audioapi/HostObjects/TypedAudioNodePtr.hpp>
 #include <audioapi/HostObjects/effects/PeriodicWaveHostObject.h>
 #include <audioapi/HostObjects/utils/JsEnumParser.h>
 #include <audioapi/core/BaseAudioContext.h>

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/AudioParam.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/AudioParam.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/core/AudioParam.h>
 #include <audioapi/core/BaseAudioContext.h>
-#include <audioapi/core/utils/param/ParamRenderEventFactory.hpp>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/core/utils/param/ParamRenderEventFactory.h>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/dsp/VectorMath.h>
 #include <audioapi/utils/AudioArray.hpp>
 #include <memory>

diff --git a/...n/cpp/audioapi/core/CompositeAudioParam.h → ...cpp/audioapi/core/CompositeAudioParam.hpp b/...n/cpp/audioapi/core/CompositeAudioParam.h → ...cpp/audioapi/core/CompositeAudioParam.hpp
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/analysis/AnalyserNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/analysis/AnalyserNode.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/analysis/AnalyserNode.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/dsp/VectorMath.h>
 #include <audioapi/types/NodeOptions.h>
 

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/effects/BiquadFilterNode.h b/packages/react-native-audio-api/common/cpp/audioapi/core/effects/BiquadFilterNode.h
@@ -30,7 +30,7 @@
 
 #include <audioapi/core/AudioNode.h>
 #include <audioapi/core/AudioParam.h>
-#include <audioapi/core/CompositeAudioParam.h>
+#include <audioapi/core/CompositeAudioParam.hpp>
 #include <audioapi/core/types/BiquadFilterType.h>
 #include <audioapi/utils/AudioBuffer.hpp>
 #if RN_AUDIO_API_TEST

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferBaseSourceNode.h b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferBaseSourceNode.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <audioapi/core/CompositeAudioParam.h>
+#include <audioapi/core/CompositeAudioParam.hpp>
 #include <audioapi/core/sources/AudioScheduledSourceNode.h>
 #include <audioapi/core/utils/Constants.h>
 #include <audioapi/dsp/WsolaTimeStretcher.h>

diff --git a/...es/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferQueueSourceNode.cpp b/...es/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferQueueSourceNode.cpp
@@ -4,7 +4,7 @@
 #include <audioapi/core/utils/Constants.h>
 #include <audioapi/core/utils/Locker.h>
 #include <audioapi/core/utils/buffer/QueueBufferProcessor.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/events/AudioEventHandlerRegistry.h>
 #include <audioapi/types/NodeOptions.h>
 #include <audioapi/utils/AudioArray.hpp>

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferSourceNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioBufferSourceNode.cpp
@@ -3,7 +3,7 @@
 #include <audioapi/core/sources/AudioBufferSourceNode.h>
 #include <audioapi/core/utils/Constants.h>
 #include <audioapi/core/utils/Locker.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/events/AudioEventHandlerRegistry.h>
 #include <audioapi/types/NodeOptions.h>
 #include <audioapi/utils/AudioArray.hpp>

diff --git a/...ages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp b/...ages/react-native-audio-api/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/AudioScheduledSourceNode.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/events/AudioEventHandlerRegistry.h>
 #include <audioapi/utils/AudioArray.hpp>
 #if !RN_AUDIO_API_TEST

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/ConstantSourceNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/ConstantSourceNode.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/ConstantSourceNode.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/types/NodeOptions.h>
 #include <audioapi/utils/AudioArray.hpp>
 

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.cpp
@@ -1,7 +1,7 @@
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/OscillatorNode.h>
 #include <audioapi/core/utils/Constants.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/types/NodeOptions.h>
 #include <audioapi/utils/AudioArray.hpp>
 

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.h b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <audioapi/core/AudioParam.h>
-#include <audioapi/core/CompositeAudioParam.h>
+#include <audioapi/core/CompositeAudioParam.hpp>
 #include <audioapi/core/effects/PeriodicWave.h>
 #include <audioapi/core/sources/AudioScheduledSourceNode.h>
 #include <audioapi/core/types/OscillatorType.h>

diff --git a/...ages/react-native-audio-api/common/cpp/audioapi/core/utils/buffer/BufferProcessorBase.cpp b/...ages/react-native-audio-api/common/cpp/audioapi/core/utils/buffer/BufferProcessorBase.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/core/utils/buffer/BufferProcessingDirection.h>
 #include <audioapi/core/utils/buffer/BufferProcessorBase.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/utils/AudioBuffer.hpp>
 #include <audioapi/utils/Macros.h>
 #include <algorithm>

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/utils/buffer/BufferProcessorBase.h b/packages/react-native-audio-api/common/cpp/audioapi/core/utils/buffer/BufferProcessorBase.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <audioapi/core/utils/buffer/BufferProcessingDirection.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/utils/AudioBuffer.hpp>
 #include <audioapi/utils/Macros.h>
 #include <cstddef>

diff --git a/...e/utils/param/ParamRenderEventFactory.hpp → ...ore/utils/param/ParamRenderEventFactory.h b/...e/utils/param/ParamRenderEventFactory.hpp → ...ore/utils/param/ParamRenderEventFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <audioapi/core/utils/param/RenderParamEvent.h>
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/utils/AudioArray.hpp>
 #include <memory>
 #include <utility>

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/utils/param/ParamRenderQueue.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/utils/param/ParamRenderQueue.cpp
@@ -1,6 +1,6 @@
 #include <audioapi/core/types/ParamEventType.h>
 #include <audioapi/core/utils/param/ParamQueueBase.hpp>
-#include <audioapi/core/utils/param/ParamRenderEventFactory.hpp>
+#include <audioapi/core/utils/param/ParamRenderEventFactory.h>
 #include <audioapi/core/utils/param/ParamRenderQueue.h>
 #include <cstddef>
 #include <optional>

diff --git a/...pi/common/cpp/audioapi/dsp/AudioUtils.hpp → ...-api/common/cpp/audioapi/dsp/AudioUtils.h b/...pi/common/cpp/audioapi/dsp/AudioUtils.hpp → ...-api/common/cpp/audioapi/dsp/AudioUtils.h
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/dsp/VectorMath.cpp b/packages/react-native-audio-api/common/cpp/audioapi/dsp/VectorMath.cpp
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/dsp/VectorMath.h>
 #include <algorithm>
 

diff --git a/...udioapi/events/AudioEventPayloadMapping.h → ...ioapi/events/AudioEventPayloadMapping.hpp b/...udioapi/events/AudioEventPayloadMapping.h → ...ioapi/events/AudioEventPayloadMapping.hpp
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/events/EventCaller.hpp b/packages/react-native-audio-api/common/cpp/audioapi/events/EventCaller.hpp
@@ -2,7 +2,7 @@
 
 #include <audioapi/events/AudioEvent.h>
 #include <audioapi/events/AudioEventPayload.h>
-#include <audioapi/events/AudioEventPayloadMapping.h>
+#include <audioapi/events/AudioEventPayloadMapping.hpp>
 #include <audioapi/events/IAudioEventHandlerRegistry.h>
 #include <audioapi/utils/Macros.h>
 

diff --git a/packages/react-native-audio-api/common/cpp/audioapi/jsi/HostObject.h b/packages/react-native-audio-api/common/cpp/audioapi/jsi/HostObject.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <audioapi/jsi/RuntimeInstanceCache.h>
+#include <audioapi/jsi/RuntimeInstanceCache.hpp>
 
 #include <jsi/jsi.h>
 #include <map>

diff --git a/...n/cpp/audioapi/jsi/RuntimeInstanceCache.h → ...cpp/audioapi/jsi/RuntimeInstanceCache.hpp b/...n/cpp/audioapi/jsi/RuntimeInstanceCache.h → ...cpp/audioapi/jsi/RuntimeInstanceCache.hpp
diff --git a/...ges/react-native-audio-api/common/cpp/audioapi/utils/events/PositionChangedDispatcher.cpp b/...ges/react-native-audio-api/common/cpp/audioapi/utils/events/PositionChangedDispatcher.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/dsp/AudioUtils.hpp>
+#include <audioapi/dsp/AudioUtils.h>
 #include <audioapi/utils/events/PositionChangedDispatcher.h>
 
 #include <algorithm>

diff --git a/packages/react-native-audio-api/common/cpp/test/src/core/CompositeAudioParamTest.cpp b/packages/react-native-audio-api/common/cpp/test/src/core/CompositeAudioParamTest.cpp
@@ -1,5 +1,5 @@
 #include <audioapi/core/AudioParam.h>
-#include <audioapi/core/CompositeAudioParam.h>
+#include <audioapi/core/CompositeAudioParam.hpp>
 #include <audioapi/core/OfflineAudioContext.h>
 #include <gtest/gtest.h>
 #include <test/src/MockAudioEventHandlerRegistry.h>

diff --git a/packages/react-native-audio-api/common/cpp/test/src/events/EventCallerTest.cpp b/packages/react-native-audio-api/common/cpp/test/src/events/EventCallerTest.cpp
@@ -1,4 +1,4 @@
-#include <audioapi/events/AudioEventPayloadMapping.h>
+#include <audioapi/events/AudioEventPayloadMapping.hpp>
 #include <audioapi/events/EventCaller.hpp>
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>