diff --git a/include/GuiSys/CGuiTextSupport.hpp b/include/GuiSys/CGuiTextSupport.hpp
index 9c65d2a0..8bc8cf0e 100644
--- a/include/GuiSys/CGuiTextSupport.hpp
+++ b/include/GuiSys/CGuiTextSupport.hpp
@@ -1,44 +1,19 @@
 #ifndef _CGUITEXTSUPPORT
 #define _CGUITEXTSUPPORT
 
+#include "Kyoto/SObjectTag.hpp"
+
+#include "Kyoto/Text/TextCommon.hpp"
+
 #include "rstl/string.hpp"
 #include "rstl/vector.hpp"
+#include "rstl/pair.hpp"
 
 class CColor;
 class CGuiFrame;
 class CTextExecuteBuffer;
 class CTextParser;
-
-enum EJustification {
-  kJ_Left = 0,
-  kJ_Center,
-  kJ_Right,
-  kJ_Full,
-  kJ_NLeft,
-  kJ_NCenter,
-  kJ_NRight,
-  kJ_LeftMono,
-  kJ_CenterMono,
-  kJ_RightMono,
-};
-
-enum EVerticalJustification {
-  kVJ_Top = 0,
-  kVJ_Center,
-  kVJ_Bottom,
-  kVJ_Full,
-  kVJ_NTop,
-  kVJ_NCenter,
-  kVJ_NBottom,
-  kVJ_TopMono,
-  kVJ_CenterMono,
-  kVJ_RightMono,
-};
-
-enum ETextDirection {
-  kTD_Horizontal,
-  kTD_Vertical,
-};
+class CSimplePool;
 
 class CGuiTextProperties {
   friend class CGuiTextSupport;
diff --git a/include/dolphin/dvd.h b/include/dolphin/dvd.h
index 666c4798..e48c34b1 100644
--- a/include/dolphin/dvd.h
+++ b/include/dolphin/dvd.h
@@ -92,7 +92,7 @@ void DVDReset();
 s32 DVDCancel(DVDCommandBlock* block);
 BOOL DVDOpen(char* fileName, DVDFileInfo* fileInfo);
 BOOL DVDFastOpen(s32 entrynum, DVDFileInfo* fileInfo);
-s32 DVDGetCommandBlockStatus(DVDCommandBlock* block);
+s32 DVDGetCommandBlockStatus(const DVDCommandBlock* block);
 BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback);
 s32 DVDCancel(DVDCommandBlock* block);
 BOOL DVDCancelAllAsync(DVDCBCallback callback);
diff --git a/src/MetroidPrime/CCredits.cpp b/src/MetroidPrime/CCredits.cpp
index 2350a2ef..e980f5c6 100644
--- a/src/MetroidPrime/CCredits.cpp
+++ b/src/MetroidPrime/CCredits.cpp
@@ -59,7 +59,7 @@ CIOWin::EMessageReturn CCredits::Update(float dt, CArchitectureQueue& queue) {
         x30_text.push_back(rstl::pair< rstl::single_ptr< CGuiTextSupport >, CVector2i >(
             new CGuiTextSupport(
                 gpResourceFactory->GetResourceIdByName(gpTweakGui->GetCreditsFont().data())->id,
-                CGuiTextProperties(true, true, kJ_Center, kVJ_Top),
+                CGuiTextProperties(true, true, kJustification_Center, kVerticalJustification_Top),
                 gpTweakGui->GetCreditsTextFontColor(), gpTweakGui->GetCreditsTextBorderColor(),
                 CColor::White(), CGraphics::GetViewport().mWidth - 64, 0, gpSimplePool,
                 CGuiWidget::kGMDF_Alpha),