diff --git a/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h b/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
index 268614cb..03a5726a 100644
--- a/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
+++ b/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
@@ -63,8 +63,8 @@ private:
     STATE_FUNC_DECLARE(dLytMeterGanbariGauge_c, Recovery);
     STATE_FUNC_DECLARE(dLytMeterGanbariGauge_c, ToMax);
 
-    void changeState(const sStateIDIf_c &value) {                                                                 \
-        mStateMgrMain.changeState(value);                                                                                  \
+    void changeState(const sStateIDIf_c &value) {
+        mStateMgrMain.changeState(value);
     }
 
     STATE_MGR(dLytMeterGanbariGauge_c) mStateMgrMain;
diff --git a/include/s/s_State.hpp b/include/s/s_State.hpp
index 58a198d2..40e15303 100644
--- a/include/s/s_State.hpp
+++ b/include/s/s_State.hpp
@@ -2,8 +2,8 @@
 #define S_STATE_H
 
 #include "s/s_FStateMgr.hpp"
-#include "s/s_StateMethodUsr_FI.hpp"
 #include "s/s_FStateVirtualID.hpp"
+#include "s/s_StateMethodUsr_FI.hpp"
 
 // Note: Ported from https://github.com/NSMBW-Community/NSMBW-Decomp/tree/master/include/dol/sLib
 // See include/s/README.txt for changes made
@@ -34,12 +34,12 @@
 
 #define STATE_MGR(class_name) sFStateMgr_c<class_name, sStateMethodUsr_FI_c>
 
-#define STATE_MGR_DEFINE_UTIL_CHANGESTATE(class_name)                                                                 \
-    void changeState(const sStateIDIf_c &value) {                                                                 \
+#define STATE_MGR_DEFINE_UTIL_CHANGESTATE(class_name)                                                                  \
+    void changeState(const sStateIDIf_c &value) {                                                                      \
         mStateMgr.changeState(value);                                                                                  \
     }
 
-#define STATE_MGR_DEFINE_UTIL_ISSTATE(class_name)                                                                     \
+#define STATE_MGR_DEFINE_UTIL_ISSTATE(class_name)                                                                      \
     bool isState(const sFStateID_c<class_name> &value) const {                                                         \
         return *mStateMgr.getStateID() == value;                                                                       \
     }