5 files changed, 11 insertions, 56 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs b/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs
index a94b280f..424bf788 100644
--- a/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Common/KAutoObject.cs
@@ -1,3 +1,4 @@
+using Ryujinx.Horizon.Common;
 using System.Diagnostics;
 using System.Threading;
 
@@ -16,24 +17,24 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
             _referenceCount = 1;
         }
 
-        public virtual KernelResult SetName(string name)
+        public virtual Result SetName(string name)
         {
             if (!KernelContext.AutoObjectNames.TryAdd(name, this))
             {
                 return KernelResult.InvalidState;
             }
 
-            return KernelResult.Success;
+            return Result.Success;
         }
 
-        public static KernelResult RemoveName(KernelContext context, string name)
+        public static Result RemoveName(KernelContext context, string name)
         {
             if (!context.AutoObjectNames.TryRemove(name, out _))
             {
                 return KernelResult.NotFound;
             }
 
-            return KernelResult.Success;
+            return Result.Success;
         }
 
         public static KAutoObject FindNamedObject(KernelContext context, string name)
diff --git a/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs b/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs
index 7caff21a..b1a602f1 100644
--- a/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs
@@ -1,5 +1,6 @@
 using Ryujinx.Common;
 using Ryujinx.HLE.HOS.Kernel.Threading;
+using Ryujinx.Horizon.Common;
 using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Kernel.Common
@@ -159,7 +160,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
             }
         }
 
-        public KernelResult SetLimitValue(LimitableResource resource, long limit)
+        public Result SetLimitValue(LimitableResource resource, long limit)
         {
             int index = GetIndex(resource);
 
@@ -170,7 +171,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
                     _limit[index] = limit;
                     _peak[index] = _current[index];
 
-                    return KernelResult.Success;
+                    return Result.Success;
                 }
                 else
                 {
diff --git a/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs b/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs
index 9829ae03..efa2a480 100644
--- a/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Common/KernelInit.cs
@@ -1,4 +1,5 @@
 using Ryujinx.HLE.HOS.Kernel.Memory;
+using Ryujinx.Horizon.Common;
 using System;
 
 namespace Ryujinx.HLE.HOS.Kernel.Common
@@ -21,9 +22,9 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
 
         public static void InitializeResourceLimit(KResourceLimit resourceLimit, MemorySize size)
         {
-            void EnsureSuccess(KernelResult result)
+            void EnsureSuccess(Result result)
             {
-                if (result != KernelResult.Success)
+                if (result != Result.Success)
                 {
                     throw new InvalidOperationException($"Unexpected result \"{result}\".");
                 }
diff --git a/Ryujinx.HLE/HOS/Kernel/Common/KernelResult.cs b/Ryujinx.HLE/HOS/Kernel/Common/KernelResult.cs
deleted file mode 100644
index 357b01ea..00000000
--- a/Ryujinx.HLE/HOS/Kernel/Common/KernelResult.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace Ryujinx.HLE.HOS.Kernel.Common
-{
-    enum KernelResult
-    {
-        Success              = 0,
-        SessionCountExceeded = 0xe01,
-        InvalidCapability    = 0x1c01,
-        ThreadNotStarted     = 0x7201,
-        ThreadTerminating    = 0x7601,
-        InvalidSize          = 0xca01,
-        InvalidAddress       = 0xcc01,
-        OutOfResource        = 0xce01,
-        OutOfMemory          = 0xd001,
-        HandleTableFull      = 0xd201,
-        InvalidMemState      = 0xd401,
-        InvalidPermission    = 0xd801,
-        InvalidMemRange      = 0xdc01,
-        InvalidPriority      = 0xe001,
-        InvalidCpuCore       = 0xe201,
-        InvalidHandle        = 0xe401,
-        UserCopyFailed       = 0xe601,
-        InvalidCombination   = 0xe801,
-        TimedOut             = 0xea01,
-        Cancelled            = 0xec01,
-        MaximumExceeded      = 0xee01,
-        InvalidEnumValue     = 0xf001,
-        NotFound             = 0xf201,
-        InvalidThread        = 0xf401,
-        PortRemoteClosed     = 0xf601,
-        InvalidState         = 0xfa01,
-        ReservedValue        = 0xfc01,
-        PortClosed           = 0x10601,
-        ResLimitExceeded     = 0x10801,
-        OutOfVaSpace         = 0x20601,
-        CmdBufferTooSmall    = 0x20801
-    }
-}
-\ No newline at end of file
diff --git a/Ryujinx.HLE/HOS/Kernel/Common/OnScopeExit.cs b/Ryujinx.HLE/HOS/Kernel/Common/OnScopeExit.cs
deleted file mode 100644
index d805a4e1..00000000
--- a/Ryujinx.HLE/HOS/Kernel/Common/OnScopeExit.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using System;
-
-namespace Ryujinx.HLE.HOS.Kernel.Common
-{
-    readonly struct OnScopeExit : IDisposable
-    {
-        private readonly Action _action;
-        public OnScopeExit(Action action) => _action = action;
-        public void Dispose() => _action();
-    }
-}