Move some utility files

benchmarks/BM_ADSR.cpp

@@ -40,19 +40,6 @@ public:
     std::vector<float> output;
 };
 
-BENCHMARK_DEFINE_F(EnvelopeFixture, Scalar)(benchmark::State& state)
-{
-    for (auto _ : state) {
-        envelope.reset(region.amplitudeEG, region, midiState, 0, 0, sampleRate);
-        envelope.startRelease(releaseTime);
-        for (int offset = 0; offset < envelopeSize; offset += static_cast<int>(state.range(0)))
-            for (auto& out: output)
-                out = envelope.getNextValue();
-        benchmark::DoNotOptimize(output);
-    }
-    state.counters["Blocks"] = benchmark::Counter(envelopeSize / static_cast<double>(state.range(0)), benchmark::Counter::kIsIterationInvariantRate);
-}
-
 BENCHMARK_DEFINE_F(EnvelopeFixture, Block)(benchmark::State& state)
 {
     for (auto _ : state) {
@@ -66,6 +53,5 @@ BENCHMARK_DEFINE_F(EnvelopeFixture, Block)(benchmark::State& state)
     state.counters["Blocks"] = benchmark::Counter(envelopeSize / static_cast<double>(state.range(0)), benchmark::Counter::kIsIterationInvariantRate);
 }
 
-BENCHMARK_REGISTER_F(EnvelopeFixture, Scalar)->RangeMultiplier(2)->Range((2 << 6), (2 << 11));
 BENCHMARK_REGISTER_F(EnvelopeFixture, Block)->RangeMultiplier(2)->Range((2 << 6), (2 << 11));
 BENCHMARK_MAIN();

benchmarks/BM_add.cpp

@@ -5,13 +5,13 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "SIMDHelpers.h"
-#include "Macros.h"
+#include "utility/Macros.h"
 #include <benchmark/benchmark.h>
 #include <random>
 #include <numeric>
 #include <vector>
-#include <cmath>
 #include <iostream>
+#include <cmath>
 
 class AddArray : public benchmark::Fixture {
 public:

benchmarks/BM_allWithin.cpp

@@ -5,13 +5,13 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "SIMDHelpers.h"
-#include "Macros.h"
+#include "utility/Macros.h"
 #include <benchmark/benchmark.h>
 #include <random>
 #include <numeric>
 #include <vector>
-#include <cmath>
 #include <iostream>
+#include <cmath>
 
 class WithinArray : public benchmark::Fixture {
 public:

benchmarks/BM_clamp.cpp

@@ -5,13 +5,13 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "SIMDHelpers.h"
-#include "Macros.h"
+#include "utility/Macros.h"
 #include <benchmark/benchmark.h>
 #include <random>
 #include <numeric>
 #include <vector>
-#include <cmath>
 #include <iostream>
+#include <cmath>
 
 class ClampArray : public benchmark::Fixture {
 public:

benchmarks/BM_stringResonator.cpp

@@ -4,10 +4,10 @@
 // license. You should have receive a LICENSE.md file along with the code.
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
-#include "Macros.h"
 #include "ScopedFTZ.h"
 #include "MathHelpers.h"
 #include "SIMDConfig.h"
+#include "utility/Macros.h"
 #include "effects/impl/ResonantArray.h"
 #include "effects/impl/ResonantArraySSE.h"
 #include "effects/impl/ResonantArrayAVX.h"

demos/EQ.cpp

@@ -1,15 +1,13 @@
 #include "sfizz/SfzFilter.h"
 #include "sfizz/Buffer.h"
 #include "sfizz/SIMDHelpers.h"
-#include "ghc/filesystem.hpp"
+#include "sfizz/utility/StringViewHelpers.h"
-#include "cxxopts.hpp"
-#include "sfizz/StringViewHelpers.h"
 #include <sndfile.hh>
+#include <cxxopts.hpp>
+#include <ghc/fs_std.hpp>
 #include <string>
 #include <iostream>
 
-namespace fs = ghc::filesystem;
-
 int main(int argc, char** argv)
 {
     (void)argc;

demos/Filter.cpp

@@ -1,15 +1,13 @@
 #include "sfizz/SfzFilter.h"
 #include "sfizz/Buffer.h"
 #include "sfizz/SIMDHelpers.h"
-#include "ghc/filesystem.hpp"
+#include "sfizz/utility/StringViewHelpers.h"
-#include "cxxopts.hpp"
-#include "sfizz/StringViewHelpers.h"
 #include <sndfile.hh>
+#include <cxxopts.hpp>
+#include <ghc/fs_std.hpp>
 #include <string>
 #include <iostream>
 
-namespace fs = ghc::filesystem;
-
 int main(int argc, char** argv)
 {
     (void)argc;

src/CMakeLists.txt

@@ -24,8 +24,12 @@ set(SFIZZ_HEADERS
     sfizz/CCMap.h
     sfizz/Config.h
     sfizz/Curve.h
-    sfizz/Debug.h
+    sfizz/utility/Debug.h
+    sfizz/utility/LeakDetector.h
+    sfizz/utility/Macros.h
     sfizz/utility/NumericId.h
+    sfizz/utility/StringViewHelpers.h
+    sfizz/utility/SwapAndPop.h
     sfizz/utility/XmlHelpers.h
     sfizz/modulations/ModId.h
     sfizz/modulations/ModKey.h
@@ -103,7 +107,6 @@ set(SFIZZ_HEADERS
     sfizz/SIMDHelpers.h
     sfizz/SisterVoiceRing.h
     sfizz/Smoothers.h
-    sfizz/SwapAndPop.h
     sfizz/Synth.h
     sfizz/SynthConfig.h
     sfizz/SynthPrivate.h
@@ -190,15 +193,12 @@ sfizz_add_simd_sources(SFIZZ_SOURCES ".")
 # Parser core library
 set(SFIZZ_PARSER_HEADERS
     sfizz/Defaults.h
-    sfizz/LeakDetector.h
     sfizz/Range.h
     sfizz/Opcode.h
-    sfizz/Macros.h
     sfizz/parser/Parser.h
     sfizz/parser/ParserPrivate.h
     sfizz/parser/ParserPrivate.hpp
-    sfizz/SfzHelpers.h
+    sfizz/SfzHelpers.h)
-    sfizz/StringViewHelpers.h)
 
 set(SFIZZ_PARSER_SOURCES
     sfizz/Opcode.cpp

src/sfizz/ADSREnvelope.h

@@ -5,9 +5,9 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #pragma once
-#include "LeakDetector.h"
 #include "Region.h"
 #include "MidiState.h"
+#include "utility/LeakDetector.h"
 #include <absl/types/span.h>
 namespace sfz {
 /**

src/sfizz/AudioBuffer.h

@@ -7,9 +7,9 @@
 #pragma once
 #include "Buffer.h"
 #include "Config.h"
-#include "Debug.h"
-#include "LeakDetector.h"
 #include "SIMDHelpers.h"
+#include "utility/Debug.h"
+#include "utility/LeakDetector.h"
 #include "absl/types/span.h"
 #include "absl/memory/memory.h"
 #include <array>

src/sfizz/AudioSpan.h

@@ -8,9 +8,9 @@
 #include "AudioBuffer.h"
 #include "Buffer.h"
 #include "Config.h"
-#include "Debug.h"
-#include "LeakDetector.h"
 #include "SIMDHelpers.h"
+#include "utility/Debug.h"
+#include "utility/LeakDetector.h"
 #include "absl/types/span.h"
 #include <array>
 #include <initializer_list>

src/sfizz/BeatClock.cpp

@@ -7,7 +7,7 @@
 #include "BeatClock.h"
 #include "SIMDHelpers.h"
 #include "Config.h"
-#include "Debug.h"
+#include "utility/Debug.h"
 #include <iostream>
 #include <cmath>
 

src/sfizz/Buffer.h

@@ -25,7 +25,7 @@
 
 #pragma once
 #include "Config.h"
-#include "LeakDetector.h"
+#include "utility/LeakDetector.h"
 #include <cstdlib>
 #include <cstring>
 #include <memory>

src/sfizz/BufferPool.h

@@ -6,10 +6,10 @@
 
 #pragma once
 #include "Config.h"
-#include "Debug.h"
 #include "Buffer.h"
 #include "AudioBuffer.h"
 #include "AudioSpan.h"
+#include "utility/Debug.h"
 #include <array>
 #include <memory>
 #include <functional>

src/sfizz/CCMap.h

@@ -5,8 +5,8 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #pragma once
-#include "LeakDetector.h"
 #include "SfzHelpers.h"
+#include "utility/LeakDetector.h"
 #include <vector>
 #include <absl/algorithm/container.h>
 #include <absl/types/optional.h>

src/sfizz/Curve.cpp

@@ -7,8 +7,8 @@
 #include "Curve.h"
 #include "Opcode.h"
 #include "SIMDHelpers.h"
-#include "Debug.h"
+#include "utility/Debug.h"
-#include "spline/spline.h"
+#include <spline/spline.h>
 #include <cmath>
 
 namespace sfz

src/sfizz/EGDescription.h

@@ -26,10 +26,10 @@
 #pragma once
 #include "Config.h"
 #include "Defaults.h"
-#include "Macros.h"
-#include "LeakDetector.h"
 #include "SfzHelpers.h"
 #include "MidiState.h"
+#include "utility/Macros.h"
+#include "utility/LeakDetector.h"
 #include <absl/types/optional.h>
 
 namespace sfz {

src/sfizz/EQPool.cpp

@@ -1,8 +1,8 @@
 #include "EQPool.h"
-#include <thread>
-#include "absl/algorithm/container.h"
 #include "SIMDHelpers.h"
-#include "SwapAndPop.h"
+#include "utility/SwapAndPop.h"
+#include <absl/algorithm/container.h>
+#include <thread>
 
 sfz::EQHolder::EQHolder(Resources& resources)
 : resources(resources)

src/sfizz/FileId.cpp

@@ -5,7 +5,7 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "FileId.h"
-#include "StringViewHelpers.h"
+#include "utility/StringViewHelpers.h"
 #include <iostream>
 
 size_t std::hash<sfz::FileId>::operator()(const sfz::FileId &id) const

src/sfizz/FilePool.cpp

@@ -28,14 +28,14 @@
 #include "Buffer.h"
 #include "AudioBuffer.h"
 #include "AudioSpan.h"
-#include "SwapAndPop.h"
 #include "Config.h"
-#include "Debug.h"
 #include "Oversampler.h"
+#include "utility/SwapAndPop.h"
+#include "utility/Debug.h"
 #include <ThreadPool.h>
-#include "absl/types/span.h"
+#include <absl/types/span.h>
-#include "absl/strings/match.h"
+#include <absl/strings/match.h>
-#include "absl/memory/memory.h"
+#include <absl/memory/memory.h>
 #include <algorithm>
 #include <memory>
 #include <thread>

src/sfizz/FilePool.h

@@ -26,20 +26,20 @@
 #pragma once
 #include "Config.h"
 #include "Defaults.h"
-#include "LeakDetector.h"
 #include "RTSemaphore.h"
 #include "AudioBuffer.h"
 #include "AudioSpan.h"
 #include "FileId.h"
 #include "FileMetadata.h"
 #include "SIMDHelpers.h"
-#include <SpinMutex.h>
+#include "Logger.h"
-#include "ghc/fs_std.hpp"
+#include "SpinMutex.h"
+#include "utility/LeakDetector.h"
+#include <ghc/fs_std.hpp>
 #include <absl/container/flat_hash_map.h>
 #include <absl/types/optional.h>
-#include "absl/strings/string_view.h"
+#include <absl/strings/string_view.h>
-#include "atomic_queue/atomic_queue.h"
+#include <atomic_queue/atomic_queue.h>
-#include "Logger.h"
 #include <chrono>
 #include <thread>
 #include <future>

src/sfizz/FilterPool.cpp

@@ -1,7 +1,7 @@
 #include "FilterPool.h"
 #include "SIMDHelpers.h"
-#include "SwapAndPop.h"
+#include "utility/SwapAndPop.h"
-#include "absl/algorithm/container.h"
+#include <absl/algorithm/container.h>
 #include <thread>
 #include <chrono>
 

src/sfizz/Logger.cpp

@@ -5,9 +5,9 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "Logger.h"
-#include "Debug.h"
+#include "utility/Debug.h"
-#include "absl/algorithm/container.h"
+#include <ghc/fs_std.hpp>
-#include "ghc/fs_std.hpp"
+#include <absl/algorithm/container.h>
 #include <iostream>
 #include <fstream>
 #include <sstream>

src/sfizz/Logger.h

@@ -6,14 +6,14 @@
 
 #pragma once
 #include "Config.h"
-#include "LeakDetector.h"
+#include "utility/LeakDetector.h"
-#include "atomic_queue/atomic_queue.h"
+#include <atomic_queue/atomic_queue.h>
+#include <absl/strings/string_view.h>
 #include <vector>
 #include <string>
 #include <chrono>
 #include <functional>
 #include <thread>
-#include "absl/strings/string_view.h"
 
 namespace sfz
 {

src/sfizz/MathHelpers.h

@@ -9,10 +9,10 @@
  * @brief Contains math helper functions and math constants
  */
 #pragma once
-#include "Debug.h"
 #include "Config.h"
-#include "Macros.h"
 #include "SIMDConfig.h"
+#include "utility/Debug.h"
+#include "utility/Macros.h"
 #include "absl/types/span.h"
 #include <algorithm>
 #include <array>

src/sfizz/MidiState.cpp

@@ -5,8 +5,8 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "MidiState.h"
-#include "Macros.h"
+#include "utility/Macros.h"
-#include "Debug.h"
+#include "utility/Debug.h"
 
 sfz::MidiState::MidiState()
 {

src/sfizz/OnePoleFilter.h

@@ -6,9 +6,9 @@
 
 #pragma once
 #include "Config.h"
-#include "Debug.h"
 #include "MathHelpers.h"
-#include "Macros.h"
+#include "utility/Debug.h"
+#include "utility/Macros.h"
 #include <absl/types/span.h>
 #include <cmath>
 

src/sfizz/Opcode.cpp

@@ -6,11 +6,11 @@
 
 #include "Opcode.h"
 #include "LFODescription.h"
-#include "StringViewHelpers.h"
+#include "utility/StringViewHelpers.h"
-#include "Debug.h"
+#include "utility/Debug.h"
-#include "absl/strings/ascii.h"
+#include <absl/strings/ascii.h>
-#include "absl/strings/match.h"
+#include <absl/strings/match.h>
-#include "absl/strings/str_cat.h"
+#include <absl/strings/str_cat.h>
 #include <limits>
 #include <iostream>
 #include <cctype>

src/sfizz/Opcode.h

@@ -6,10 +6,10 @@
 
 #pragma once
 #include "Defaults.h"
-#include "LeakDetector.h"
 #include "Range.h"
 #include "SfzHelpers.h"
-#include "StringViewHelpers.h"
+#include "utility/LeakDetector.h"
+#include "utility/StringViewHelpers.h"
 #include "absl/types/optional.h"
 #include "absl/meta/type_traits.h"
 #include "absl/strings/ascii.h"

src/sfizz/OpcodeCleanup.cpp

@@ -8,10 +8,10 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "Opcode.h"
-#include "Macros.h"
+#include "utility/Macros.h"
-#include "absl/strings/string_view.h"
+#include <absl/strings/string_view.h>
-#include "absl/strings/str_cat.h"
+#include <absl/strings/str_cat.h>
-#include "absl/strings/ascii.h"
+#include <absl/strings/ascii.h>
 #include <string>
 
 namespace sfz {

src/sfizz/OpcodeCleanup.re

@@ -6,10 +6,10 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "Opcode.h"
-#include "Macros.h"
+#include "utility/Macros.h"
-#include "absl/strings/string_view.h"
+#include <absl/strings/string_view.h>
-#include "absl/strings/str_cat.h"
+#include <absl/strings/str_cat.h>
-#include "absl/strings/ascii.h"
+#include <absl/strings/ascii.h>
 #include <string>
 
 namespace sfz {

src/sfizz/Oversampler.h

@@ -5,14 +5,14 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #pragma once
-#include <array>
-#include <memory>
-#include "absl/types/span.h"
-#include "Debug.h"
 #include "Buffer.h"
 #include "AudioBuffer.h"
 #include "AudioSpan.h"
 #include "Config.h"
+#include "utility/Debug.h"
+#include <absl/types/span.h>
+#include <array>
+#include <memory>
 
 namespace sfz {
 class AudioReader;

src/sfizz/OversamplerHelpers.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "SIMDConfig.h"
 #include "Config.h"
-#include "Debug.h"
+#include "utility/Debug.h"
 #include <type_traits>
 #include <cstring>
 

src/sfizz/PolyphonyGroup.cpp

@@ -1,4 +1,5 @@
 #include "PolyphonyGroup.h"
+#include <absl/algorithm/container.h>
 
 sfz::PolyphonyGroup::PolyphonyGroup()
 {

src/sfizz/PolyphonyGroup.h

@@ -9,8 +9,7 @@
 #include "Config.h"
 #include "Region.h"
 #include "Voice.h"
-#include "SwapAndPop.h"
+#include "utility/SwapAndPop.h"
-#include "absl/algorithm/container.h"
 
 namespace sfz
 {

src/sfizz/Range.h

@@ -6,7 +6,7 @@
 
 #pragma once
 #include "MathHelpers.h"
-#include "Macros.h"
+#include "utility/Macros.h"
 #include <type_traits>
 #include <limits>
 

src/sfizz/Region.cpp

@@ -5,12 +5,12 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "Region.h"
-#include "MathHelpers.h"
-#include "Macros.h"
-#include "Debug.h"
 #include "Opcode.h"
-#include "SwapAndPop.h"
+#include "MathHelpers.h"
-#include "StringViewHelpers.h"
+#include "utility/SwapAndPop.h"
+#include "utility/StringViewHelpers.h"
+#include "utility/Macros.h"
+#include "utility/Debug.h"
 #include "ModifierHelpers.h"
 #include "modulations/ModId.h"
 #include "absl/strings/str_replace.h"

src/sfizz/Region.h

@@ -7,7 +7,6 @@
 #pragma once
 #include "CCMap.h"
 #include "Curve.h"
-#include "LeakDetector.h"
 #include "Defaults.h"
 #include "EGDescription.h"
 #include "FlexEGDescription.h"
@@ -19,6 +18,7 @@
 #include "MidiState.h"
 #include "FileId.h"
 #include "utility/NumericId.h"
+#include "utility/LeakDetector.h"
 #include "modulations/ModKey.h"
 #include "absl/types/optional.h"
 #include "absl/strings/string_view.h"

src/sfizz/RegionSet.h

@@ -9,7 +9,7 @@
 #include "Region.h"
 #include "Voice.h"
 #include "Opcode.h"
-#include "SwapAndPop.h"
+#include "utility/SwapAndPop.h"
 #include <vector>
 
 namespace sfz

src/sfizz/SIMDHelpers.cpp

@@ -6,7 +6,7 @@
 
 #include "SIMDHelpers.h"
 #include "SIMDConfig.h"
-#include "Debug.h"
+#include "utility/Debug.h"
 #include "simd/HelpersSSE.h"
 #include "simd/HelpersAVX.h"
 #include "cpuid/cpuinfo.hpp"

src/sfizz/SIMDHelpers.h

@@ -25,9 +25,9 @@
  */
 #pragma once
 #include "Config.h"
-#include "Debug.h"
 #include "Range.h"
 #include "MathHelpers.h"
+#include "utility/Debug.h"
 #include "simd/HelpersScalar.h"
 #include <absl/types/span.h>
 #include <array>

src/sfizz/SfzFilter.cpp

@@ -7,10 +7,10 @@
 #include "Config.h"
 #include "SfzFilter.h"
 #include "SfzFilterImpls.hpp"
-#include "StringViewHelpers.h"
-#include <cstring>
 #include "SIMDHelpers.h"
-#include "Debug.h"
+#include "utility/StringViewHelpers.h"
+#include "utility/Debug.h"
+#include <cstring>
 
 namespace sfz {
 

src/sfizz/SfzHelpers.h

@@ -5,17 +5,17 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #pragma once
-#include <absl/types/optional.h>
-#include <absl/strings/string_view.h>
-#include <absl/algorithm/container.h>
-//#include <string>
-#include <array>
-#include <cmath>
-#include "Macros.h"
 #include "Config.h"
 #include "MathHelpers.h"
 #include "SIMDHelpers.h"
-#include "absl/meta/type_traits.h"
+#include "utility/Macros.h"
+//#include <string>
+#include <array>
+#include <cmath>
+#include <absl/types/optional.h>
+#include <absl/strings/string_view.h>
+#include <absl/algorithm/container.h>
+#include <absl/meta/type_traits.h>
 
 namespace sfz {
 

src/sfizz/SisterVoiceRing.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "Voice.h"
-#include "Debug.h"
+#include "utility/Debug.h"
 #include "absl/meta/type_traits.h"
 
 namespace sfz

src/sfizz/Synth.cpp

@@ -6,8 +6,8 @@
 
 #include "SynthPrivate.h"
 #include "Config.h"
-#include "Debug.h"
+#include "utility/Debug.h"
-#include "Macros.h"
+#include "utility/Macros.h"
 #include "modulations/ModId.h"
 #include "modulations/ModKey.h"
 #include "modulations/ModMatrix.h"
@@ -17,7 +17,7 @@
 #include "RegionSet.h"
 #include "Resources.h"
 #include "ScopedFTZ.h"
-#include "StringViewHelpers.h"
+#include "utility/StringViewHelpers.h"
 #include "utility/XmlHelpers.h"
 #include "Voice.h"
 #include "Interpolators.h"

src/sfizz/Synth.h

@@ -6,10 +6,10 @@
 
 #pragma once
 #include "AudioSpan.h"
-#include "LeakDetector.h"
 #include "Resources.h"
 #include "Messaging.h"
 #include "utility/NumericId.h"
+#include "utility/LeakDetector.h"
 #include "parser/Parser.h"
 #include <ghc/fs_std.hpp>
 #include <absl/strings/string_view.h>

src/sfizz/SynthMessaging.cpp

@@ -5,7 +5,7 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "SynthPrivate.h"
-#include "StringViewHelpers.h"
+#include "utility/StringViewHelpers.h"
 #include <absl/strings/ascii.h>
 #include <cstring>
 

src/sfizz/Tuning.cpp

@@ -5,9 +5,9 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "Tuning.h"
-#include "Debug.h"
-#include "absl/types/optional.h"
 #include "Tunings.h" // Surge tuning library
+#include "utility/Debug.h"
+#include <absl/types/optional.h>
 #include <algorithm>
 #include <fstream>
 #include <sstream>

src/sfizz/Voice.cpp

@@ -13,7 +13,6 @@
 #include "FlexEnvelope.h"
 #include "Interpolators.h"
 #include "LFO.h"
-#include "Macros.h"
 #include "MathHelpers.h"
 #include "ModifierHelpers.h"
 #include "modulations/ModId.h"
@@ -25,6 +24,7 @@
 #include "SfzHelpers.h"
 #include "SIMDHelpers.h"
 #include "Smoothers.h"
+#include "utility/Macros.h"
 #include <absl/algorithm/container.h>
 #include <absl/types/span.h>
 #include <random>

src/sfizz/Voice.h

@@ -10,8 +10,8 @@
 #include "Region.h"
 #include "Resources.h"
 #include "AudioSpan.h"
-#include "LeakDetector.h"
 #include "utility/NumericId.h"
+#include "utility/LeakDetector.h"
 #include <memory>
 
 namespace sfz {

src/sfizz/Wavetables.h

@@ -6,9 +6,9 @@
 
 #pragma once
 #include "Config.h"
-#include "LeakDetector.h"
 #include "Buffer.h"
 #include "MathHelpers.h"
+#include "utility/LeakDetector.h"
 #include <absl/types/span.h>
 #include <absl/container/flat_hash_map.h>
 #include <array>

src/sfizz/effects/Apan.cpp

@@ -21,9 +21,9 @@
 */
 
 #include "Apan.h"
-#include "Macros.h"
 #include "LFOCommon.h"
 #include "Opcode.h"
+#include "utility/Macros.h"
 #include <limits>
 #include <cmath>
 

src/sfizz/effects/Eq.cpp

@@ -21,8 +21,8 @@
 #include "Eq.h"
 #include "Opcode.h"
 #include "SIMDHelpers.h"
-#include "Debug.h"
+#include "utility/Debug.h"
-#include "absl/memory/memory.h"
+#include <absl/memory/memory.h>
 
 namespace sfz {
 namespace fx {

src/sfizz/effects/Filter.cpp

@@ -23,8 +23,8 @@ Potential extensions (like ARIA)
 #include "Filter.h"
 #include "Opcode.h"
 #include "SIMDHelpers.h"
-#include "Debug.h"
+#include "utility/Debug.h"
-#include "absl/memory/memory.h"
+#include <absl/memory/memory.h>
 
 namespace sfz {
 namespace fx {

src/sfizz/modulations/ModKeyHash.cpp

@@ -7,7 +7,7 @@
 #include "ModKeyHash.h"
 #include "ModKey.h"
 #include "ModId.h"
-#include "StringViewHelpers.h"
+#include "utility/StringViewHelpers.h"
 #include <cstdint>
 
 size_t std::hash<sfz::ModKey>::operator()(const sfz::ModKey &key) const

src/sfizz/modulations/ModMatrix.cpp

@@ -11,7 +11,7 @@
 #include "Buffer.h"
 #include "Config.h"
 #include "SIMDHelpers.h"
-#include "Debug.h"
+#include "utility/Debug.h"
 #include <absl/container/flat_hash_map.h>
 #include <absl/strings/string_view.h>
 #include <vector>

src/sfizz/modulations/sources/ADSREnvelope.cpp

@@ -9,9 +9,7 @@
 #include "../../Synth.h"
 #include "../../Voice.h"
 #include "../../Config.h"
-#include "../../Debug.h"
+#include "../../utility/Debug.h"
-
-// TODO(jpc): also matrix the ampeg
 
 namespace sfz {
 

src/sfizz/modulations/sources/Controller.cpp

@@ -10,7 +10,7 @@
 #include "../../ModifierHelpers.h"
 #include "../../Resources.h"
 #include "../../Config.h"
-#include "../../Debug.h"
+#include "../../utility/Debug.h"
 #include <absl/container/flat_hash_map.h>
 
 namespace sfz {

src/sfizz/modulations/sources/FlexEnvelope.cpp

@@ -10,7 +10,7 @@
 #include "../../Voice.h"
 #include "../../SIMDHelpers.h"
 #include "../../Config.h"
-#include "../../Debug.h"
+#include "../../utility/Debug.h"
 
 namespace sfz {
 

src/sfizz/modulations/sources/LFO.cpp

@@ -10,7 +10,7 @@
 #include "../../Voice.h"
 #include "../../SIMDHelpers.h"
 #include "../../Config.h"
-#include "../../Debug.h"
+#include "../../utility/Debug.h"
 
 namespace sfz {
 

src/sfizz/sfizz_wrapper.cpp

@@ -5,9 +5,9 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "Config.h"
-#include "Macros.h"
 #include "Synth.h"
 #include "Messaging.h"
+#include "utility/Macros.h"
 #include "sfizz.h"
 #include "sfizz_private.hpp"
 #include <limits>

src/sfizz/utility/NumericId.h

@@ -5,7 +5,7 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #pragma once
-#include "../StringViewHelpers.h"
+#include "StringViewHelpers.h"
 #include <functional>
 
 /**

tests/HelpersT.cpp

@@ -4,7 +4,7 @@
 // license. You should have receive a LICENSE.md file along with the code.
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
-#include "sfizz/StringViewHelpers.h"
+#include "sfizz/utility/StringViewHelpers.h"
 #include "catch2/catch.hpp"
 #include "absl/strings/string_view.h"
 using namespace Catch::literals;

tests/SwapAndPopT.cpp

@@ -5,7 +5,7 @@
 // If not, contact the sfizz maintainers at https://github.com/sfztools/sfizz
 
 #include "catch2/catch.hpp"
-#include "sfizz/SwapAndPop.h"
+#include "sfizz/utility/SwapAndPop.h"
 using namespace Catch::literals;
 
 TEST_CASE("[SwapAndPop] Popping one element")