diff --git a/src/audio_core/adsp/apps/opus/opus_decoder.cpp b/src/audio_core/adsp/apps/opus/opus_decoder.cpp
index 0fc0a0619d..d0782a1f73 100644
--- a/src/audio_core/adsp/apps/opus/opus_decoder.cpp
+++ b/src/audio_core/adsp/apps/opus/opus_decoder.cpp
@@ -5,13 +5,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <array>
-#include <chrono>
 
 #include "audio_core/adsp/apps/opus/opus_decode_object.h"
 #include "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
 #include "audio_core/adsp/apps/opus/shared_memory.h"
 #include "audio_core/audio_core.h"
-#include "audio_core/common/common.h"
 #include "common/logging.h"
 #include "common/thread.h"
 #include "core/core.h"
diff --git a/src/audio_core/adsp/apps/opus/opus_decoder.h b/src/audio_core/adsp/apps/opus/opus_decoder.h
index 7cdac1da51..2c4342c638 100644
--- a/src/audio_core/adsp/apps/opus/opus_decoder.h
+++ b/src/audio_core/adsp/apps/opus/opus_decoder.h
@@ -6,10 +6,9 @@
 
 #pragma once
 
-#include <memory>
 #include <thread>
 
-#include "ankerl/unordered_dense.h"
+#include "common/container/unordered_map.h"
 #include "audio_core/adsp/apps/opus/opus_decode_object.h"
 #include "audio_core/adsp/apps/opus/opus_multistream_decode_object.h"
 #include "audio_core/adsp/apps/opus/shared_memory.h"
@@ -92,8 +91,8 @@ private:
     /// and the responses are written back by the OpusDecoder.
     SharedMemory* shared_memory{};
 
-    ankerl::unordered_dense::map<u64, OpusDecodeObject> decode_objects;
-    ankerl::unordered_dense::map<u64, OpusMultiStreamDecodeObject> ms_decode_objects;
+    ::Common::unordered_map<u64, OpusDecodeObject> decode_objects;
+    ::Common::unordered_map<u64, OpusMultiStreamDecodeObject> ms_decode_objects;
 };
 
 } // namespace AudioCore::ADSP::OpusDecoder