diff --git a/src/audio/taAudio.h b/src/audio/taAudio.h
index 20491dbbe..12de61e95 100644
--- a/src/audio/taAudio.h
+++ b/src/audio/taAudio.h
@@ -21,7 +21,7 @@
 #define _TAAUDIO_H
 #include "../ta-utils.h"
 #include <memory>
-#include <queue>
+#include "../fixedQueue.h"
 #include <vector>
 
 struct SampleRateChangeEvent {
@@ -124,7 +124,7 @@ struct TAMidiMessage {
 
 class TAMidiIn {
   public:
-    std::queue<TAMidiMessage> queue;
+    FixedQueue<TAMidiMessage,8192> queue;
     virtual bool gather();
     bool next(TAMidiMessage& where);
     virtual bool isDeviceOpen();
@@ -139,7 +139,7 @@ class TAMidiIn {
 };
 
 class TAMidiOut {
-  std::queue<TAMidiMessage> queue;
+  FixedQueue<TAMidiMessage,8192> queue;
   public:
     virtual bool send(const TAMidiMessage& what);
     virtual bool isDeviceOpen();
diff --git a/src/engine/engine.h b/src/engine/engine.h
index 9b85d0837..0e4b57fcf 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.h
@@ -37,7 +37,7 @@
 #include <mutex>
 #include <map>
 #include <unordered_map>
-#include "fixedQueue.h"
+#include "../fixedQueue.h"
 
 class DivWorkPool;
 
diff --git a/src/engine/platform/ay.h b/src/engine/platform/ay.h
index 2948f3b85..354557fda 100644
--- a/src/engine/platform/ay.h
+++ b/src/engine/platform/ay.h
@@ -20,7 +20,7 @@
 #ifndef _AY_H
 #define _AY_H
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/ay8910.h"
 
 class DivPlatformAY8910: public DivDispatch {
diff --git a/src/engine/platform/ay8930.h b/src/engine/platform/ay8930.h
index 0ff69ad40..ba2f9abea 100644
--- a/src/engine/platform/ay8930.h
+++ b/src/engine/platform/ay8930.h
@@ -20,7 +20,7 @@
 #ifndef _AY8930_H
 #define _AY8930_H
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/ay8910.h"
 
 class DivPlatformAY8930: public DivDispatch {
diff --git a/src/engine/platform/c140.h b/src/engine/platform/c140.h
index fb74151c0..9dea0c0c5 100644
--- a/src/engine/platform/c140.h
+++ b/src/engine/platform/c140.h
@@ -22,7 +22,7 @@
 
 #include "../dispatch.h"
 #include "sound/c140_c219.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 class DivPlatformC140: public DivDispatch {
   struct Channel: public SharedChannel<int> {
diff --git a/src/engine/platform/c64.h b/src/engine/platform/c64.h
index def32eaab..38e735d9a 100644
--- a/src/engine/platform/c64.h
+++ b/src/engine/platform/c64.h
@@ -21,7 +21,7 @@
 #define _C64_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/c64/sid.h"
 #include "sound/c64_fp/SID.h"
 #include "sound/c64_d/dsid.h"
diff --git a/src/engine/platform/es5506.h b/src/engine/platform/es5506.h
index 07bdb2380..6bac20c37 100644
--- a/src/engine/platform/es5506.h
+++ b/src/engine/platform/es5506.h
@@ -22,7 +22,7 @@
 
 #include "../dispatch.h"
 #include "../engine.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../macroInt.h"
 #include "../sample.h"
 #include "vgsound_emu/src/es550x/es5506.hpp"
diff --git a/src/engine/platform/fmsharedbase.h b/src/engine/platform/fmsharedbase.h
index 9be217b94..e458904eb 100644
--- a/src/engine/platform/fmsharedbase.h
+++ b/src/engine/platform/fmsharedbase.h
@@ -22,7 +22,7 @@
 
 #include "../dispatch.h"
 #include "../instrument.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 #define KVS(x,y) ((chan[x].state.op[y].kvs==2 && isOutput[chan[x].state.alg][y]) || chan[x].state.op[y].kvs==1)
 
diff --git a/src/engine/platform/ga20.h b/src/engine/platform/ga20.h
index 691b68f0a..3831d32c2 100644
--- a/src/engine/platform/ga20.h
+++ b/src/engine/platform/ga20.h
@@ -21,7 +21,7 @@
 #define _GA20_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../macroInt.h"
 #include "sound/ga20/iremga20.h"
 
diff --git a/src/engine/platform/gb.h b/src/engine/platform/gb.h
index f92a0b895..0e7fb52d3 100644
--- a/src/engine/platform/gb.h
+++ b/src/engine/platform/gb.h
@@ -23,7 +23,7 @@
 #include "../dispatch.h"
 #include "../waveSynth.h"
 #include "sound/gb/gb.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 class DivPlatformGB: public DivDispatch {
   struct Channel: public SharedChannel<signed char> {
diff --git a/src/engine/platform/k007232.h b/src/engine/platform/k007232.h
index e3409b31f..5eb379985 100644
--- a/src/engine/platform/k007232.h
+++ b/src/engine/platform/k007232.h
@@ -21,7 +21,7 @@
 #define _K007232_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../macroInt.h"
 #include "vgsound_emu/src/k007232/k007232.hpp"
 
diff --git a/src/engine/platform/msm5232.h b/src/engine/platform/msm5232.h
index abdb72f06..efa5c919c 100644
--- a/src/engine/platform/msm5232.h
+++ b/src/engine/platform/msm5232.h
@@ -21,7 +21,7 @@
 #define _MSM5232_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/oki/msm5232.h"
 
 class DivPlatformMSM5232: public DivDispatch {
diff --git a/src/engine/platform/msm6258.h b/src/engine/platform/msm6258.h
index ce73ca4bb..2a4c3512b 100644
--- a/src/engine/platform/msm6258.h
+++ b/src/engine/platform/msm6258.h
@@ -21,7 +21,7 @@
 #define _MSM6258_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/oki/okim6258.h"
 
 class DivPlatformMSM6258: public DivDispatch {
diff --git a/src/engine/platform/msm6295.h b/src/engine/platform/msm6295.h
index dfa59a0c1..19815f0da 100644
--- a/src/engine/platform/msm6295.h
+++ b/src/engine/platform/msm6295.h
@@ -21,7 +21,7 @@
 #define _MSM6295_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "vgsound_emu/src/msm6295/msm6295.hpp"
 
 class DivPlatformMSM6295: public DivDispatch, public vgsound_emu_mem_intf {
diff --git a/src/engine/platform/n163.h b/src/engine/platform/n163.h
index c5ec64b7e..e4d5b24d2 100644
--- a/src/engine/platform/n163.h
+++ b/src/engine/platform/n163.h
@@ -21,7 +21,7 @@
 #define _N163_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../waveSynth.h"
 #include "vgsound_emu/src/n163/n163.hpp"
 
diff --git a/src/engine/platform/namcowsg.h b/src/engine/platform/namcowsg.h
index 7d6943323..ab4451705 100644
--- a/src/engine/platform/namcowsg.h
+++ b/src/engine/platform/namcowsg.h
@@ -21,7 +21,7 @@
 #define _NAMCOWSG_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../waveSynth.h"
 #include "sound/namco.h"
 
diff --git a/src/engine/platform/opl.h b/src/engine/platform/opl.h
index 2298f6132..bcc147da1 100644
--- a/src/engine/platform/opl.h
+++ b/src/engine/platform/opl.h
@@ -21,7 +21,7 @@
 #define _OPL_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../../../extern/opl/opl3.h"
 #include "sound/ymfm/ymfm_adpcm.h"
 
diff --git a/src/engine/platform/opll.h b/src/engine/platform/opll.h
index 8bb6baa2c..e8bd627a4 100644
--- a/src/engine/platform/opll.h
+++ b/src/engine/platform/opll.h
@@ -21,7 +21,7 @@
 #define _OPLL_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 extern "C" {
 #include "../../../extern/Nuked-OPLL/opll.h"
diff --git a/src/engine/platform/pce.h b/src/engine/platform/pce.h
index f989034af..2436453e4 100644
--- a/src/engine/platform/pce.h
+++ b/src/engine/platform/pce.h
@@ -21,7 +21,7 @@
 #define _PCE_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../waveSynth.h"
 #include "sound/pce_psg.h"
 
diff --git a/src/engine/platform/pcspkr.h b/src/engine/platform/pcspkr.h
index d9315b5ec..b2a88b903 100644
--- a/src/engine/platform/pcspkr.h
+++ b/src/engine/platform/pcspkr.h
@@ -21,7 +21,7 @@
 #define _PCSPKR_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include <thread>
 #include <mutex>
 #include <condition_variable>
diff --git a/src/engine/platform/pokey.h b/src/engine/platform/pokey.h
index 979f60754..7e64c3c78 100644
--- a/src/engine/platform/pokey.h
+++ b/src/engine/platform/pokey.h
@@ -21,7 +21,7 @@
 #define _POKEY_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 extern "C" {
 #include "sound/pokey/mzpokeysnd.h"
diff --git a/src/engine/platform/saa.h b/src/engine/platform/saa.h
index 36db57cb7..339799d2e 100644
--- a/src/engine/platform/saa.h
+++ b/src/engine/platform/saa.h
@@ -21,7 +21,7 @@
 #define _SAA_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../../../extern/SAASound/src/SAASound.h"
 
 class DivPlatformSAA1099: public DivDispatch {
diff --git a/src/engine/platform/segapcm.h b/src/engine/platform/segapcm.h
index 639d875b4..b03459f5d 100644
--- a/src/engine/platform/segapcm.h
+++ b/src/engine/platform/segapcm.h
@@ -23,7 +23,7 @@
 #include "../dispatch.h"
 #include "../instrument.h"
 #include "sound/segapcm.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 class DivPlatformSegaPCM: public DivDispatch {
   protected:
diff --git a/src/engine/platform/sm8521.h b/src/engine/platform/sm8521.h
index 02e2f458e..f9faeebda 100644
--- a/src/engine/platform/sm8521.h
+++ b/src/engine/platform/sm8521.h
@@ -21,7 +21,7 @@
 #define _SM8521_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../waveSynth.h"
 #include "sound/sm8521.h"
 
diff --git a/src/engine/platform/sms.h b/src/engine/platform/sms.h
index d87546b30..5eaf204ba 100644
--- a/src/engine/platform/sms.h
+++ b/src/engine/platform/sms.h
@@ -25,7 +25,7 @@
 extern "C" {
   #include "../../../extern/Nuked-PSG/ympsg.h"
 }
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 class DivPlatformSMS: public DivDispatch {
   struct Channel: public SharedChannel<signed char> {
diff --git a/src/engine/platform/snes.h b/src/engine/platform/snes.h
index a799c7a5d..0992a46a7 100644
--- a/src/engine/platform/snes.h
+++ b/src/engine/platform/snes.h
@@ -22,7 +22,7 @@
 
 #include "../dispatch.h"
 #include "../waveSynth.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/snes/SPC_DSP.h"
 
 class DivPlatformSNES: public DivDispatch {
diff --git a/src/engine/platform/su.h b/src/engine/platform/su.h
index 99b784df3..4f227e5b5 100644
--- a/src/engine/platform/su.h
+++ b/src/engine/platform/su.h
@@ -21,7 +21,7 @@
 #define _SU_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/su.h"
 
 class DivPlatformSoundUnit: public DivDispatch {
diff --git a/src/engine/platform/swan.h b/src/engine/platform/swan.h
index 1e0fbeef7..5f33e81c0 100644
--- a/src/engine/platform/swan.h
+++ b/src/engine/platform/swan.h
@@ -23,7 +23,7 @@
 #include "../dispatch.h"
 #include "../waveSynth.h"
 #include "sound/swan.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 
 class DivPlatformSwan: public DivDispatch {
   struct Channel: public SharedChannel<int> {
diff --git a/src/engine/platform/t6w28.h b/src/engine/platform/t6w28.h
index 4bb3cda2a..5e69c6268 100644
--- a/src/engine/platform/t6w28.h
+++ b/src/engine/platform/t6w28.h
@@ -21,7 +21,7 @@
 #define _T6W28_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/t6w28/T6W28_Apu.h"
 
 class DivPlatformT6W28: public DivDispatch {
diff --git a/src/engine/platform/ted.h b/src/engine/platform/ted.h
index 58b4d0b7d..a2bd1d636 100644
--- a/src/engine/platform/ted.h
+++ b/src/engine/platform/ted.h
@@ -21,7 +21,7 @@
 #define _TED_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/ted-sound.h"
 
 class DivPlatformTED: public DivDispatch {
diff --git a/src/engine/platform/tx81z.h b/src/engine/platform/tx81z.h
index c14bc0117..93da1cd7a 100644
--- a/src/engine/platform/tx81z.h
+++ b/src/engine/platform/tx81z.h
@@ -21,7 +21,7 @@
 #define _TX81Z_H
 
 #include "fmshared_OPM.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "sound/ymfm/ymfm_opz.h"
 
 class DivTXInterface: public ymfm::ymfm_interface {
diff --git a/src/engine/platform/vb.h b/src/engine/platform/vb.h
index 2282f62fe..508e9a049 100644
--- a/src/engine/platform/vb.h
+++ b/src/engine/platform/vb.h
@@ -21,7 +21,7 @@
 #define _PLATFORM_VB_H
 
 #include "../dispatch.h"
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../waveSynth.h"
 #include "sound/vsu.h"
 
diff --git a/src/engine/platform/vrc6.h b/src/engine/platform/vrc6.h
index df0aa92e5..f20e0d39c 100644
--- a/src/engine/platform/vrc6.h
+++ b/src/engine/platform/vrc6.h
@@ -20,7 +20,7 @@
 #ifndef _VRC6_H
 #define _VRC6_H
 
-#include "../fixedQueue.h"
+#include "../../fixedQueue.h"
 #include "../dispatch.h"
 #include "vgsound_emu/src/vrcvi/vrcvi.hpp"
 
diff --git a/src/engine/sample.h b/src/engine/sample.h
index 3b5a356d3..253fe347c 100644
--- a/src/engine/sample.h
+++ b/src/engine/sample.h
@@ -24,7 +24,7 @@
 #include "defines.h"
 #include "safeWriter.h"
 #include "dataErrors.h"
-#include "fixedQueue.h"
+#include "../fixedQueue.h"
 
 enum DivSampleLoopMode: unsigned char {
   DIV_SAMPLE_LOOP_FORWARD=0,
diff --git a/src/engine/workPool.h b/src/engine/workPool.h
index 9c41e1ccf..17e4be52a 100644
--- a/src/engine/workPool.h
+++ b/src/engine/workPool.h
@@ -26,7 +26,7 @@
 #include <functional>
 #include <future>
 
-#include "fixedQueue.h"
+#include "../fixedQueue.h"
 
 class DivWorkPool;
 
diff --git a/src/engine/fixedQueue.h b/src/fixedQueue.h
similarity index 99%
rename from src/engine/fixedQueue.h
rename to src/fixedQueue.h
index 03a1ed3a1..91ebeea36 100644
--- a/src/engine/fixedQueue.h
+++ b/src/fixedQueue.h
@@ -21,7 +21,7 @@
 #define _FIXED_QUEUE_H
 
 #include <stdint.h>
-#include "../ta-log.h"
+#include "ta-log.h"
 
 template<typename T, size_t items> struct FixedQueue {
   size_t readPos, writePos;