diff --git a/include/heap/seadHeapMgr.h b/include/heap/seadHeapMgr.h
index 1bc4c5d4..fc49fa5f 100644
--- a/include/heap/seadHeapMgr.h
+++ b/include/heap/seadHeapMgr.h
@@ -15,18 +15,19 @@ namespace sead
 {
 class HeapMgr : hostio::Node
 {
-    struct AllocFailedCallbackArg;
     struct AllocCallbackArg;
     struct CreateCallbackArg;
     struct DestroyCallbackArg;
     struct FreeCallbackArg;
-    using IAllocFailedCallback = IDelegate1<const AllocFailedCallbackArg*>;
     using IAllocCallback = IDelegate1<const AllocCallbackArg*>;
     using ICreateCallback = IDelegate1<const CreateCallbackArg*>;
     using IDestroyCallback = IDelegate1<const DestroyCallbackArg*>;
     using IFreeCallback = IDelegate1<const FreeCallbackArg*>;
 
 public:
+    struct AllocFailedCallbackArg;
+    using IAllocFailedCallback = IDelegate1<const AllocFailedCallbackArg*>;
+
     HeapMgr();
     virtual ~HeapMgr() {}
 
@@ -69,7 +70,7 @@ class HeapMgr : hostio::Node
     friend class ScopedCurrentHeapSetter;
 
     /// Set the current heap to the specified heap and returns the previous "current heap".
-    sead::Heap* setCurrentHeap_(sead::Heap* heap);
+    Heap* setCurrentHeap_(Heap* heap);
 
     static Arena sDefaultArena;
     static RootHeaps sRootHeaps;