Add in missing cereal includes.

2024-05-09 16:24:05 -04:00 · 2018-08-08 23:14:09 +08:00 · 2018-08-08 23:14:09 +08:00 · 150a872f2c
parent 99f502c4cc
commit 150a872f2c
62 changed files with 133 additions and 1 deletions
--- a/liborbum/src/Common/Types/FifoQueue/DmaFifoQueue.hpp
+++ b/liborbum/src/Common/Types/FifoQueue/DmaFifoQueue.hpp
@ -3,6 +3,8 @@
 #include <cstddef>
 #include <stdexcept>

+#include <cereal/cereal.hpp>
+
 #include <Queues.hpp>

 #include "Common/Types/FifoQueue/FifoQueue.hpp"
--- a/liborbum/src/Common/Types/Mips/BranchDelaySlot.hpp
+++ b/liborbum/src/Common/Types/Mips/BranchDelaySlot.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Primitive.hpp"
 #include "Common/Types/Register/PcRegisters.hpp"

--- a/liborbum/src/Common/Types/Primitive.hpp
+++ b/liborbum/src/Common/Types/Primitive.hpp
@ -5,6 +5,8 @@
 #include <cstdint>
 #include <limits>

+#include <cereal/cereal.hpp>
+
 /// PS2 Primative Data Types.
 /// These types should be used throughout the emulator when operating on the PS2 system state.
 /// The PS2 and SCE manuals use this size terminology:
--- a/liborbum/src/Common/Types/Register/SizedByteRegister.hpp
+++ b/liborbum/src/Common/Types/Register/SizedByteRegister.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Register/ByteRegister.hpp"

 /// Sized Byte register.
--- a/liborbum/src/Common/Types/Register/SizedDwordRegister.hpp
+++ b/liborbum/src/Common/Types/Register/SizedDwordRegister.hpp
@ -2,6 +2,8 @@

 #include <stdexcept>

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Primitive.hpp"
 #include "Common/Types/Register/DwordRegister.hpp"

--- a/liborbum/src/Common/Types/Register/SizedHwordRegister.hpp
+++ b/liborbum/src/Common/Types/Register/SizedHwordRegister.hpp
@ -2,6 +2,9 @@

 #include <stdexcept>

+
+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Primitive.hpp"
 #include "Common/Types/Register/HwordRegister.hpp"

--- a/liborbum/src/Common/Types/Register/SizedQwordRegister.hpp
+++ b/liborbum/src/Common/Types/Register/SizedQwordRegister.hpp
@ -2,6 +2,8 @@

 #include <stdexcept>

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Primitive.hpp"
 #include "Common/Types/Register/QwordRegister.hpp"

--- a/liborbum/src/Common/Types/Register/SizedWordRegister.hpp
+++ b/liborbum/src/Common/Types/Register/SizedWordRegister.hpp
@ -2,6 +2,8 @@

 #include <stdexcept>

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Primitive.hpp"
 #include "Common/Types/Register/WordRegister.hpp"

--- a/liborbum/src/Resources/Cdvd/CdvdNvrams.hpp
+++ b/liborbum/src/Resources/Cdvd/CdvdNvrams.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayHwordMemory.hpp"

 /// Contains information about the CDVD NVRAM state, used to store various data.
--- a/liborbum/src/Resources/Cdvd/CdvdRegisters.hpp
+++ b/liborbum/src/Resources/Cdvd/CdvdRegisters.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Bitfield.hpp"
--- a/liborbum/src/Resources/Cdvd/CdvdRtc.hpp
+++ b/liborbum/src/Resources/Cdvd/CdvdRtc.hpp
@ -1,3 +1,7 @@
+#pragma once
+
+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Primitive.hpp"

 /// Real time clock of the CDVD.
--- a/liborbum/src/Resources/Cdvd/RCdvd.hpp
+++ b/liborbum/src/Resources/Cdvd/RCdvd.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Resources/Cdvd/CdvdFifoQueues.hpp"
 #include "Resources/Cdvd/CdvdNvrams.hpp"
 #include "Resources/Cdvd/CdvdRegisters.hpp"
--- a/liborbum/src/Resources/Ee/Core/EeCoreCop0.hpp
+++ b/liborbum/src/Resources/Ee/Core/EeCoreCop0.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Mips/MipsCoprocessor0.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Ee/Core/EeCoreCop0Registers.hpp
+++ b/liborbum/src/Resources/Ee/Core/EeCoreCop0Registers.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Mips/MipsCoprocessor0.hpp"
--- a/liborbum/src/Resources/Ee/Core/EeCoreFpu.hpp
+++ b/liborbum/src/Resources/Ee/Core/EeCoreFpu.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Mips/MipsCoprocessor.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Ee/Core/EeCoreR5900.hpp
+++ b/liborbum/src/Resources/Ee/Core/EeCoreR5900.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Mips/BranchDelaySlot.hpp"
 #include "Common/Types/Register/PcRegisters.hpp"
--- a/liborbum/src/Resources/Ee/Core/EeCoreTlb.hpp
+++ b/liborbum/src/Resources/Ee/Core/EeCoreTlb.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Primitive.hpp"
 #include "Resources/Ee/Core/EeCoreTlbEntry.hpp"
--- a/liborbum/src/Resources/Ee/Core/EeCoreTlbEntry.hpp
+++ b/liborbum/src/Resources/Ee/Core/EeCoreTlbEntry.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 /// Custom Mask type, provides useful cached values when constructed.
 class Mask
 {
--- a/liborbum/src/Resources/Ee/Core/REeCore.hpp
+++ b/liborbum/src/Resources/Ee/Core/REeCore.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Resources/Ee/Core/EeCoreCop0.hpp"
 #include "Resources/Ee/Core/EeCoreFpu.hpp"
--- a/liborbum/src/Resources/Ee/Dmac/EeDmacChannelRegisters.hpp
+++ b/liborbum/src/Resources/Ee/Dmac/EeDmacChannelRegisters.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Ee/Dmac/EeDmacChannels.hpp
+++ b/liborbum/src/Resources/Ee/Dmac/EeDmacChannels.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
--- a/liborbum/src/Resources/Ee/Dmac/EeDmatag.hpp
+++ b/liborbum/src/Resources/Ee/Dmac/EeDmatag.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Bitfield.hpp"
 #include "Common/Types/Primitive.hpp"

--- a/liborbum/src/Resources/Ee/Dmac/REeDmac.hpp
+++ b/liborbum/src/Resources/Ee/Dmac/REeDmac.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
 #include "Resources/Ee/Dmac/EeDmacChannels.hpp"
--- a/liborbum/src/Resources/Ee/EeRegisters.hpp
+++ b/liborbum/src/Resources/Ee/EeRegisters.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/access.hpp>
 #include <cereal/types/polymorphic.hpp>
 #include <cereal/types/string.hpp>
--- a/liborbum/src/Resources/Ee/Gif/RGif.hpp
+++ b/liborbum/src/Resources/Ee/Gif/RGif.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"

--- a/liborbum/src/Resources/Ee/Intc/REeIntc.hpp
+++ b/liborbum/src/Resources/Ee/Intc/REeIntc.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Resources/Ee/Intc/EeIntcRegisters.hpp"

--- a/liborbum/src/Resources/Ee/Ipu/RIpu.hpp
+++ b/liborbum/src/Resources/Ee/Ipu/RIpu.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Common/Types/Register/SizedDwordRegister.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Ee/REe.hpp
+++ b/liborbum/src/Resources/Ee/REe.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Bus/ByteBus.hpp"
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Common/Types/Primitive.hpp"
--- a/liborbum/src/Resources/Ee/Timers/EeTimersUnitRegisters.hpp
+++ b/liborbum/src/Resources/Ee/Timers/EeTimersUnitRegisters.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Ee/Timers/EeTimersUnits.hpp
+++ b/liborbum/src/Resources/Ee/Timers/EeTimersUnits.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Register/SizedWordRegister.hpp"
 #include "Resources/Ee/Timers/EeTimersUnitRegisters.hpp"

--- a/liborbum/src/Resources/Ee/Timers/REeTimers.hpp
+++ b/liborbum/src/Resources/Ee/Timers/REeTimers.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Resources/Ee/Timers/EeTimersUnits.hpp"

--- a/liborbum/src/Resources/Ee/Vpu/RVpu.hpp
+++ b/liborbum/src/Resources/Ee/Vpu/RVpu.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Resources/Ee/Vpu/Vif/RVif.hpp"
 #include "Resources/Ee/Vpu/VpuRegisters.hpp"
 #include "Resources/Ee/Vpu/Vu/RVu.hpp"
--- a/liborbum/src/Resources/Ee/Vpu/Vif/RVif.hpp
+++ b/liborbum/src/Resources/Ee/Vpu/Vif/RVif.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Resources/Ee/Vpu/Vif/VifUnits.hpp"

--- a/liborbum/src/Resources/Ee/Vpu/Vif/VifUnits.hpp
+++ b/liborbum/src/Resources/Ee/Vpu/Vif/VifUnits.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
 #include "Resources/Ee/Vpu/Vif/VifUnitRegisters.hpp"

--- a/liborbum/src/Resources/Ee/Vpu/Vu/RVu.hpp
+++ b/liborbum/src/Resources/Ee/Vpu/Vu/RVu.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Resources/Ee/Vpu/Vu/VuRegisters.hpp"
 #include "Resources/Ee/Vpu/Vu/VuUnits.hpp"
--- a/liborbum/src/Resources/Ee/Vpu/Vu/VuUnits.hpp
+++ b/liborbum/src/Resources/Ee/Vpu/Vu/VuUnits.hpp
@ -1,5 +1,8 @@
 #pragma once

+#include <cereal/cereal.hpp>
+#include <cereal/types/polymorphic.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Bus/ByteBus.hpp"
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
--- a/liborbum/src/Resources/Gs/RGs.hpp
+++ b/liborbum/src/Resources/Gs/RGs.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Common/Types/Register/SizedDwordRegister.hpp"
 #include "Resources/Gs/Crtc/RCrtc.hpp"
--- a/liborbum/src/Resources/Iop/Core/IopCoreCop0.hpp
+++ b/liborbum/src/Resources/Iop/Core/IopCoreCop0.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Mips/MipsCoprocessor0.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Iop/Core/IopCoreCop0Registers.hpp
+++ b/liborbum/src/Resources/Iop/Core/IopCoreCop0Registers.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Mips/MipsCoprocessor0.hpp"
--- a/liborbum/src/Resources/Iop/Core/IopCoreR3000.hpp
+++ b/liborbum/src/Resources/Iop/Core/IopCoreR3000.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Mips/BranchDelaySlot.hpp"
 #include "Common/Types/Register/PcRegisters.hpp"
--- a/liborbum/src/Resources/Iop/Core/RIopCore.hpp
+++ b/liborbum/src/Resources/Iop/Core/RIopCore.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Resources/Iop/Core/IopCoreCop0.hpp"
 #include "Resources/Iop/Core/IopCoreR3000.hpp"
--- a/liborbum/src/Resources/Iop/Dmac/IopDmacChannelRegisters.hpp
+++ b/liborbum/src/Resources/Iop/Dmac/IopDmacChannelRegisters.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Iop/Dmac/IopDmacChannels.hpp
+++ b/liborbum/src/Resources/Iop/Dmac/IopDmacChannels.hpp
@ -1,5 +1,8 @@
 #pragma once

+#include <cereal/cereal.hpp>
+#include <cereal/types/polymorphic.hpp>
+
 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
 #include "Resources/Iop/Dmac/IopDmacChannelRegisters.hpp"
@ -65,4 +68,14 @@ public:
    }

    SizedWordRegister tadr;
+
+public:
+    template<class Archive>
+    void serialize(Archive & archive)
+    {
+        archive(
+            cereal::base_class<IopDmacChannel_Base<IopDmacChannelRegister_Chcr_Ty>>(this),
+            CEREAL_NVP(tadr)
+        );
+    }
 };
--- a/liborbum/src/Resources/Iop/Dmac/IopDmatag.hpp
+++ b/liborbum/src/Resources/Iop/Dmac/IopDmatag.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Primitive.hpp"

 /// An IOP DMAtag type, as explained by wisi and SP193's IOP DMA docs.
--- a/liborbum/src/Resources/Iop/Dmac/RIopDmac.hpp
+++ b/liborbum/src/Resources/Iop/Dmac/RIopDmac.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
 #include "Resources/Iop/Dmac/IopDmacChannelRegisters.hpp"
--- a/liborbum/src/Resources/Iop/Intc/RIopIntc.hpp
+++ b/liborbum/src/Resources/Iop/Intc/RIopIntc.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Resources/Iop/Intc/IopIntcRegisters.hpp"

 /// IOP INTC resources.
--- a/liborbum/src/Resources/Iop/RIop.hpp
+++ b/liborbum/src/Resources/Iop/RIop.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Bus/ByteBus.hpp"
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
--- a/liborbum/src/Resources/Iop/Sio0/RSio0.hpp
+++ b/liborbum/src/Resources/Iop/Sio0/RSio0.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Register/SizedHwordRegister.hpp"
 #include "Resources/Iop/Sio0/Sio0Registers.hpp"

--- a/liborbum/src/Resources/Iop/Sio0/Sio0Registers.hpp
+++ b/liborbum/src/Resources/Iop/Sio0/Sio0Registers.hpp
@ -1,3 +1,7 @@
+#pragma once
+
+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Bitfield.hpp"
 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
 #include "Common/Types/Register/ByteRegister.hpp"
--- a/liborbum/src/Resources/Iop/Sio2/RSio2.hpp
+++ b/liborbum/src/Resources/Iop/Sio2/RSio2.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Iop/Sio2/Sio2PortRegisters.hpp
+++ b/liborbum/src/Resources/Iop/Sio2/Sio2PortRegisters.hpp
@ -1,3 +1,6 @@
+#pragma once
+
+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Bitfield.hpp"
--- a/liborbum/src/Resources/Iop/Sio2/Sio2Ports.hpp
+++ b/liborbum/src/Resources/Iop/Sio2/Sio2Ports.hpp
@ -1,3 +1,7 @@
+#pragma once
+
+#include <cereal/cereal.hpp>
+
 #include "Resources/Iop/Sio2/Sio2PortRegisters.hpp"

 /// Describes an abstract SIO2 port.
--- a/liborbum/src/Resources/Iop/Sio2/Sio2Registers.hpp
+++ b/liborbum/src/Resources/Iop/Sio2/Sio2Registers.hpp
@ -1,5 +1,6 @@
 #pragma once

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
--- a/liborbum/src/Resources/Iop/Timers/IopTimersUnitRegisters.hpp
+++ b/liborbum/src/Resources/Iop/Timers/IopTimersUnitRegisters.hpp
@ -2,6 +2,7 @@

 #include <utility>

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Iop/Timers/IopTimersUnits.hpp
+++ b/liborbum/src/Resources/Iop/Timers/IopTimersUnits.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Register/SizedWordRegister.hpp"
 #include "Resources/Iop/Timers/IopTimersUnitRegisters.hpp"

--- a/liborbum/src/Resources/Iop/Timers/RIopTimers.hpp
+++ b/liborbum/src/Resources/Iop/Timers/RIopTimers.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Resources/Iop/Timers/IopTimersUnits.hpp"

--- a/liborbum/src/Resources/RResources.hpp
+++ b/liborbum/src/Resources/RResources.hpp
@ -2,6 +2,8 @@

 #include <memory>

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Common/Types/Register/SizedWordRegister.hpp"
--- a/liborbum/src/Resources/Spu2/RSpu2.hpp
+++ b/liborbum/src/Resources/Spu2/RSpu2.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/Memory/ArrayByteMemory.hpp"
 #include "Common/Types/Memory/ArrayHwordMemory.hpp"
--- a/liborbum/src/Resources/Spu2/Spu2CoreRegisters.hpp
+++ b/liborbum/src/Resources/Spu2/Spu2CoreRegisters.hpp
@ -2,6 +2,7 @@

 #include <cstddef>

+#include <cereal/cereal.hpp>
 #include <cereal/types/polymorphic.hpp>

 #include "Common/Types/Bitfield.hpp"
--- a/liborbum/src/Resources/Spu2/Spu2CoreVoice.hpp
+++ b/liborbum/src/Resources/Spu2/Spu2CoreVoice.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Types/Register/SizedHwordRegister.hpp"
 #include "Resources/Spu2/Spu2CoreVoiceRegisters.hpp"

--- a/liborbum/src/Resources/Spu2/Spu2Cores.hpp
+++ b/liborbum/src/Resources/Spu2/Spu2Cores.hpp
@ -1,5 +1,7 @@
 #pragma once

+#include <cereal/cereal.hpp>
+
 #include "Common/Constants.hpp"
 #include "Common/Types/FifoQueue/DmaFifoQueue.hpp"
 #include "Resources/Spu2/Spu2CoreConstants.hpp"
--- a/utilities/src/Queues.hpp
+++ b/utilities/src/Queues.hpp
@ -4,10 +4,11 @@
 #include <mutex>
 #include <stdexcept>
 #include <vector>
+#include <condition_variable>

 #include <boost/lockfree/spsc_queue.hpp>

-#include <condition_variable>
+#include <cereal/cereal.hpp>

 // TODO: the Mpsc/Spmc/Spsc classes are just Mpmc aliases...
 //       In order to support the "events" a mutex is needed