diff --git a/external/jsl/include/jsl/bits/memory/aligned_unique_ptr.tcc b/external/jsl/include/jsl/bits/memory/aligned_unique_ptr.tcc
new file mode 100644
index 00000000..168c934a
--- /dev/null
+++ b/external/jsl/include/jsl/bits/memory/aligned_unique_ptr.tcc
@@ -0,0 +1,39 @@
+// -*- C++ -*-
+// SPDX-License-Identifier: BSL-1.0
+//
+//          Copyright Jean Pierre Cimalando 2018-2020.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+//
+#pragma once
+#include "../../memory"
+
+namespace jsl {
+
+template <class T, std::size_t Al>
+void aligned_ptr_delete<T, Al>::operator()(T *p) const noexcept
+{
+    aligned_allocator<T, Al> allocator;
+    allocator.destroy(p);
+    allocator.deallocate(p, 0);
+}
+
+template <class T, std::size_t Al, class... Args>
+aligned_unique_ptr<typename make_aligned_traits<T>::single_element, Al>
+make_aligned(Args &&... args)
+{
+    struct allocation_delete {
+        void operator()(T *p) const noexcept
+        {
+            aligned_allocator<T, Al> allocator;
+            allocator.destroy(p);
+        }
+    };
+    aligned_allocator<T, Al> allocator;
+    std::unique_ptr<T, allocation_delete> allocation(allocator.allocate(1, nullptr));
+    allocator.construct(allocation.get(), std::forward<Args>(args)...);
+    return aligned_unique_ptr<T, Al>(allocation.release());
+}
+
+} // namespace jsl
diff --git a/external/jsl/include/jsl/memory b/external/jsl/include/jsl/memory
new file mode 100644
index 00000000..a5ff5ec5
--- /dev/null
+++ b/external/jsl/include/jsl/memory
@@ -0,0 +1,42 @@
+// -*- C++ -*-
+// SPDX-License-Identifier: BSL-1.0
+//
+//          Copyright Jean Pierre Cimalando 2018-2020.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+//
+#pragma once
+#include "./allocator"
+#include <memory>
+
+namespace jsl {
+
+template <class T, std::size_t Al>
+struct aligned_ptr_delete {
+    void operator()(T *p) const noexcept;
+};
+
+template <class T, std::size_t Al>
+using aligned_unique_ptr = std::unique_ptr<T, aligned_ptr_delete<T, Al>>;
+
+//------------------------------------------------------------------------------
+
+template <class T> struct make_aligned_traits;
+template <class T, size_t N> struct make_aligned_traits<T[N]> { struct invalid {}; };
+template <class T> struct make_aligned_traits<T[]> { struct invalid {}; };
+template <class T> struct make_aligned_traits { using single_element = T; };
+
+//------------------------------------------------------------------------------
+
+template <class T, std::size_t Al, class... Args>
+aligned_unique_ptr<typename make_aligned_traits<T>::single_element, Al>
+make_aligned(Args &&... args);
+
+template <class T, std::size_t Al, class... Args>
+typename make_aligned_traits<T>::invalid
+make_aligned(Args &&... args) = delete;
+
+}  // namespace jsl
+
+#include "bits/memory/aligned_unique_ptr.tcc"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 2e5f70a9..9ae219db 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -49,6 +49,7 @@ set(SFIZZ_TEST_SOURCES
     LFOT.cpp
     MessagingT.cpp
     OversamplerT.cpp
+    MemoryT.cpp
     DataHelpers.h
     DataHelpers.cpp
 )
diff --git a/tests/MemoryT.cpp b/tests/MemoryT.cpp
new file mode 100644
index 00000000..bf7b0497
--- /dev/null
+++ b/tests/MemoryT.cpp
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: BSD-2-Clause
+
+// This code is part of the sfizz library and is licensed under a BSD 2-clause
+// 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 "catch2/catch.hpp"
+#include <jsl/memory>
+#include <vector>
+#include <cstdint>
+
+TEST_CASE("[Memory] Aligned unique pointers")
+{
+    constexpr size_t numAllocations = 128;
+    constexpr size_t alignment = 1024;
+
+    static size_t numLiveObjects;
+    numLiveObjects = 0;
+
+    struct Object {
+        explicit Object(size_t id) : id(id) { ++numLiveObjects; }
+        ~Object() { --numLiveObjects; }
+        size_t id {};
+    };
+
+    std::vector<jsl::aligned_unique_ptr<Object, alignment>> ptrs(numAllocations);
+
+    for (size_t i = 0; i < numAllocations; ++i) {
+        ptrs[i] = jsl::make_aligned<Object, alignment>(i);
+        REQUIRE(numLiveObjects == i + 1);
+
+        Object *obj = ptrs[i].get();
+        REQUIRE(obj->id == i);
+
+        uintptr_t addr = reinterpret_cast<uintptr_t>(obj);
+        REQUIRE(addr % alignment == 0);
+    }
+
+    ptrs.clear();
+    REQUIRE(numLiveObjects == 0);
+}