diff --git a/src/util/buffer.h b/src/util/buffer.h
index f40914638..3ca597af2 100644
--- a/src/util/buffer.h
+++ b/src/util/buffer.h
@@ -21,7 +21,7 @@ Revision History:
 --*/
 #pragma once
 
-#include <type_traits>
+#include <cstddef>
 #include "util/memory_manager.h"
 
 template<typename T, bool CallDestructors=true, unsigned INITIAL_SIZE=16>
@@ -30,7 +30,7 @@ protected:
     T *      m_buffer = reinterpret_cast<T*>(m_initial_buffer);
     unsigned m_pos = 0;
     unsigned m_capacity = INITIAL_SIZE;
-    typename std::aligned_storage<sizeof(T), alignof(T)>::type m_initial_buffer[INITIAL_SIZE];
+    alignas(T) std::byte m_initial_buffer[INITIAL_SIZE * sizeof(T)];
 
     void free_memory() {
         if (m_buffer != reinterpret_cast<T*>(m_initial_buffer)) {