Fix incorrect/poor names, missing import

4 files changed, 7 insertions, 6 deletions

diff --git a/include/d/lyt/d_lyt_system_window.h b/include/d/lyt/d_lyt_system_window.h
index bba711d5..87094657 100644
--- a/include/d/lyt/d_lyt_system_window.h
+++ b/include/d/lyt/d_lyt_system_window.h
@@ -80,8 +80,8 @@ public:
 
     s32 getField_0xDE0() const;
     bool getField_0xDFC() const;
-    void fn_80125E20();
-    void fn_80125EF0();
+    void fn_80152E20();
+    void fn_80152EF0();
     void fn_80152F10();
     bool fn_80152F50() const;
     bool fn_80152F60() const;
diff --git a/include/egg/core/eggSystem.h b/include/egg/core/eggSystem.h
index c1686d2e..6c1e1a22 100644
--- a/include/egg/core/eggSystem.h
+++ b/include/egg/core/eggSystem.h
@@ -333,7 +333,7 @@ public:
 
     // vtable at 0x0
     /* vt 0x08 */ virtual Video *getVideo() = 0;
-    /* vt 0x0C */ virtual Heap *getSysHeap() = 0;
+    /* vt 0x0C */ virtual Heap *getSystemHeap() = 0;
     /* vt 0x10 */ virtual Display *getDisplay() = 0;
     /* vt 0x14 */ virtual XfbManager *getXfbMgr() = 0;
     /* vt 0x18 */ virtual PerformanceView *getPerfView() = 0;
@@ -390,7 +390,7 @@ public:
         return static_cast<Video *>(mVideo);
     }
 
-    Heap *getSysHeap() override {
+    Heap *getSystemHeap() override {
         return mSystemHeap;
     }
 
@@ -449,7 +449,7 @@ public:
 
         exceptionCreate(heap);
 
-        BaseSystem::mConfigData->getSysHeap()->mFlag.setBit(0);
+        BaseSystem::mConfigData->getSystemHeap()->mFlag.setBit(0);
 
         mHeap::setCurrentHeap(mHeap::g_assertHeap);
     }
diff --git a/include/f/f_manager.h b/include/f/f_manager.h
index 9202612e..1dd4eb16 100644
--- a/include/f/f_manager.h
+++ b/include/f/f_manager.h
@@ -48,7 +48,7 @@ public:
         m_StopProcInf |= flags;
     }
 
-    static void keepStopProcFlags(u32 flags) {
+    static void maskStopProcFlags(u32 flags) {
         m_StopProcInf &= flags;
     }
 
diff --git a/include/toBeSorted/unk_save_time.h b/include/toBeSorted/unk_save_time.h
index 0f98e691..b2d8ae62 100644
--- a/include/toBeSorted/unk_save_time.h
+++ b/include/toBeSorted/unk_save_time.h
@@ -2,6 +2,7 @@
 #define UNK_SAVE_TIME_H
 
 #include "common.h"
+#include "egg/core/eggHeap.h"
 
 class SaveTimeRelated {
 public: