diff --git a/include/utils/StateUtils.h b/include/utils/StateUtils.h
index 9891335..4c399fa 100644
--- a/include/utils/StateUtils.h
+++ b/include/utils/StateUtils.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+
 class State {
 public:
     static void init();
diff --git a/src/main.cpp b/src/main.cpp
index c2cd2ba..fd3deed 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,3 @@
-#include <coreinit/debug.h>
-#include <coreinit/mcp.h>
-#include <coreinit/screen.h>
 #include <cstdlib>
 #include <cstring>
 #include <icon.h>
@@ -16,6 +13,9 @@
 #include <utils/StateUtils.h>
 #include <utils/StringUtils.h>
 #include <version.h>
+#include <coreinit/debug.h>
+#include <coreinit/mcp.h>
+#include <coreinit/screen.h>
 
 static int wiiuTitlesCount = 0, vWiiTitlesCount = 0;
 
diff --git a/src/utils/DrawUtils.cpp b/src/utils/DrawUtils.cpp
index 078b3c9..471de02 100644
--- a/src/utils/DrawUtils.cpp
+++ b/src/utils/DrawUtils.cpp
@@ -1,16 +1,14 @@
-#include <coreinit/cache.h>
-#include <coreinit/screen.h>
+#include <utils/DrawUtils.h>
+#include <utils/Colors.h>
 #include <cstdlib>
 #include <cstring>
 #include <memory>
-#include <tga_reader.h>
-#include <utils/DrawUtils.h>
-#include <utils/Colors.h>
 #include <malloc.h>
+#include <tga_reader.h>
 #include <coreinit/debug.h>
-
-#include <coreinit/memheap.h>
 #include <coreinit/cache.h>
+#include <coreinit/screen.h>
+#include <coreinit/memheap.h>
 #include <coreinit/memfrmheap.h>
 #include <coreinit/memory.h>
 #include <proc_ui/procui.h>
diff --git a/src/utils/StateUtils.cpp b/src/utils/StateUtils.cpp
index 95048cc..da6b270 100644
--- a/src/utils/StateUtils.cpp
+++ b/src/utils/StateUtils.cpp
@@ -1,16 +1,13 @@
+#include <utils/StateUtils.h>
+#include <utils/DrawUtils.h>
 #include <coreinit/core.h>
 #include <coreinit/dynload.h>
 #include <coreinit/foreground.h>
 #include <proc_ui/procui.h>
-#include <utils/StateUtils.h>
-#include <utils/DrawUtils.h>
-#include <coreinit/screen.h>
 #include <whb/proc.h>
 
 #include <string.h>
 
-#include <utils/DrawUtils.h>
-
 
 bool State::aroma = false;