diff --git a/reactos/dll/win32/kernel32/mem/heap.c b/reactos/dll/win32/kernel32/mem/heap.c
index 2158629546d..41228b737aa 100644
--- a/reactos/dll/win32/kernel32/mem/heap.c
+++ b/reactos/dll/win32/kernel32/mem/heap.c
@@ -271,4 +271,58 @@ HeapWalk(HANDLE	hHeap,
     return TRUE;
 }
 
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+HeapQueryInformation(HANDLE HeapHandle,
+                     HEAP_INFORMATION_CLASS HeapInformationClass,
+                     PVOID HeapInformation OPTIONAL,
+                     SIZE_T HeapInformationLength OPTIONAL,
+                     PSIZE_T ReturnLength OPTIONAL)
+{
+    NTSTATUS Status;
+
+    Status = RtlQueryHeapInformation(HeapHandle,
+                                     HeapInformationClass,
+                                     HeapInformation,
+                                     HeapInformationLength,
+                                     ReturnLength);
+
+    if (!NT_SUCCESS(Status))
+    {
+        SetLastErrorByStatus(Status);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+HeapSetInformation(HANDLE HeapHandle,
+                   HEAP_INFORMATION_CLASS HeapInformationClass,
+                   PVOID HeapInformation OPTIONAL,
+                   SIZE_T HeapInformationLength OPTIONAL)
+{
+    NTSTATUS Status;
+
+    Status = RtlSetHeapInformation(HeapHandle,
+                                   HeapInformationClass,
+                                   HeapInformation,
+                                   HeapInformationLength);
+
+    if (!NT_SUCCESS(Status))
+    {
+        SetLastErrorByStatus(Status);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
 /* EOF */
diff --git a/reactos/dll/win32/kernel32/misc/stubs.c b/reactos/dll/win32/kernel32/misc/stubs.c
index f7cd214da09..bf758b78d71 100644
--- a/reactos/dll/win32/kernel32/misc/stubs.c
+++ b/reactos/dll/win32/kernel32/misc/stubs.c
@@ -386,39 +386,6 @@ GetNumaProcessorNode(
     return 0;
 }
 
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-HeapQueryInformation (
-    HANDLE HeapHandle,
-    HEAP_INFORMATION_CLASS HeapInformationClass,
-    PVOID HeapInformation OPTIONAL,
-    SIZE_T HeapInformationLength OPTIONAL,
-    PSIZE_T ReturnLength OPTIONAL
-    )
-{
-    STUB;
-    return 0;
-}
-
-/*
- * @unimplemented
- */
-BOOL
-WINAPI
-HeapSetInformation (
-    HANDLE HeapHandle,
-    HEAP_INFORMATION_CLASS HeapInformationClass,
-    PVOID HeapInformation OPTIONAL,
-    SIZE_T HeapInformationLength OPTIONAL
-    )
-{
-    STUB;
-    return 0;
-}
-
 /*
  * @implemented
  */