3 files changed, 8 insertions, 6 deletions
diff --git a/src/core/hle/service/nvflinger/binder.h b/src/core/hle/service/nvflinger/binder.h
index 157333ff8..aef1477e3 100644
--- a/src/core/hle/service/nvflinger/binder.h
+++ b/src/core/hle/service/nvflinger/binder.h
@@ -9,10 +9,13 @@
 #include "common/common_types.h"
 
 namespace Kernel {
-class HLERequestContext;
 class KReadableEvent;
 } // namespace Kernel
 
+namespace Service {
+class HLERequestContext;
+}
+
 namespace Service::android {
 
 enum class TransactionId {
@@ -35,8 +38,7 @@ enum class TransactionId {
 class IBinder {
 public:
     virtual ~IBinder() = default;
-    virtual void Transact(Kernel::HLERequestContext& ctx, android::TransactionId code,
-                          u32 flags) = 0;
+    virtual void Transact(HLERequestContext& ctx, android::TransactionId code, u32 flags) = 0;
     virtual Kernel::KReadableEvent& GetNativeHandle() = 0;
 };
 
diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp
index bcbe05b0d..ad73edd66 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_producer.cpp
+++ b/src/core/hle/service/nvflinger/buffer_queue_producer.cpp
@@ -8,10 +8,10 @@
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "core/core.h"
-#include "core/hle/kernel/hle_ipc.h"
 #include "core/hle/kernel/k_event.h"
 #include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/kernel.h"
+#include "core/hle/service/hle_ipc.h"
 #include "core/hle/service/kernel_helpers.h"
 #include "core/hle/service/nvdrv/core/nvmap.h"
 #include "core/hle/service/nvflinger/buffer_queue_core.h"
@@ -813,7 +813,7 @@ Status BufferQueueProducer::SetPreallocatedBuffer(s32 slot,
     return Status::NoError;
 }
 
-void BufferQueueProducer::Transact(Kernel::HLERequestContext& ctx, TransactionId code, u32 flags) {
+void BufferQueueProducer::Transact(HLERequestContext& ctx, TransactionId code, u32 flags) {
     Status status{Status::NoError};
     InputParcel parcel_in{ctx.ReadBuffer()};
     OutputParcel parcel_out{};
diff --git a/src/core/hle/service/nvflinger/buffer_queue_producer.h b/src/core/hle/service/nvflinger/buffer_queue_producer.h
index 1d380480f..16189fa6f 100644
--- a/src/core/hle/service/nvflinger/buffer_queue_producer.h
+++ b/src/core/hle/service/nvflinger/buffer_queue_producer.h
@@ -46,7 +46,7 @@ public:
                                  Service::Nvidia::NvCore::NvMap& nvmap_);
     ~BufferQueueProducer();
 
-    void Transact(Kernel::HLERequestContext& ctx, android::TransactionId code, u32 flags) override;
+    void Transact(HLERequestContext& ctx, android::TransactionId code, u32 flags) override;
 
     Kernel::KReadableEvent& GetNativeHandle() override;