Clean up some more includes

3 files changed, 9 insertions, 11 deletions

diff --git a/core/context.cpp b/core/context.cpp
index d94daf16..145ce349 100644
--- a/core/context.cpp
+++ b/core/context.cpp
@@ -2,7 +2,10 @@
 #include "config.h"
 
 #include <cassert>
+#include <limits>
 #include <memory>
+#include <stdexcept>
+#include <utility>
 
 #include "async_event.h"
 #include "context.h"
diff --git a/core/context.h b/core/context.h
index 4febd38d..629e67a5 100644
--- a/core/context.h
+++ b/core/context.h
@@ -7,16 +7,15 @@
 #include <cstddef>
 #include <memory>
 #include <thread>
+#include <vector>
 
 #include "almalloc.h"
 #include "alspan.h"
 #include "async_event.h"
 #include "atomic.h"
-#include "bufferline.h"
 #include "opthelpers.h"
 #include "threads.h"
 #include "vecmat.h"
-#include "vector.h"
 
 struct DeviceBase;
 struct EffectSlot;
@@ -26,8 +25,6 @@ struct Voice;
 struct VoiceChange;
 struct VoicePropsItem;
 
-using uint = unsigned int;
-
 
 constexpr float SpeedOfSoundMetersPerSec{343.3f};
 
@@ -147,20 +144,20 @@ struct ContextBase {
      * in clusters that are stored in a vector for easy automatic cleanup.
      */
     using VoiceChangeCluster = std::unique_ptr<VoiceChange[]>;
-    al::vector<VoiceChangeCluster> mVoiceChangeClusters;
+    std::vector<VoiceChangeCluster> mVoiceChangeClusters;
 
     using VoiceCluster = std::unique_ptr<Voice[]>;
-    al::vector<VoiceCluster> mVoiceClusters;
+    std::vector<VoiceCluster> mVoiceClusters;
 
     using VoicePropsCluster = std::unique_ptr<VoicePropsItem[]>;
-    al::vector<VoicePropsCluster> mVoicePropClusters;
+    std::vector<VoicePropsCluster> mVoicePropClusters;
 
 
     static constexpr size_t EffectSlotClusterSize{4};
     EffectSlot *getEffectSlot();
 
     using EffectSlotCluster = std::unique_ptr<EffectSlot[]>;
-    al::vector<EffectSlotCluster> mEffectSlotClusters;
+    std::vector<EffectSlotCluster> mEffectSlotClusters;
 
 
     ContextBase(DeviceBase *device);
diff --git a/core/device.h b/core/device.h
index bc180582..33cdfe89 100644
--- a/core/device.h
+++ b/core/device.h
@@ -1,14 +1,12 @@
 #ifndef CORE_DEVICE_H
 #define CORE_DEVICE_H
 
-#include <stddef.h>
-
 #include <array>
 #include <atomic>
 #include <bitset>
 #include <chrono>
 #include <memory>
-#include <mutex>
+#include <stddef.h>
 #include <stdint.h>
 #include <string>