diff --git a/source/code/BlockGame.hpp b/source/code/BlockGame.hpp
index 17fcb4e..21efbba 100644
--- a/source/code/BlockGame.hpp
+++ b/source/code/BlockGame.hpp
@@ -24,10 +24,10 @@ http://www.blockattack.net
 #ifndef BLOCKGAME_HPP
 #define BLOCKGAME_HPP 1
 
+#include "nlohmann/json.hpp"
 #include "stats.h"
 #include "common.h"
 #include <deque>
-#include "nlohmann/json.hpp"
 
 #define NUMBEROFCHAINS 100
 #define BLOCKWAIT 100000
diff --git a/source/code/MenuSystem.cpp b/source/code/MenuSystem.cpp
index 5c73372..aa990be 100644
--- a/source/code/MenuSystem.cpp
+++ b/source/code/MenuSystem.cpp
@@ -22,11 +22,11 @@ https://blockattack.net
 */
 
 
+#include "BlockGame.hpp"
 #include "MenuSystem.h"
 #include "common.h"
 #include "global.hpp"
 #include "gamecontroller.h"
-#include "BlockGame.hpp"
 #include "menudef_themes.hpp"
 
 static int oldmousex = 0;
diff --git a/source/code/main.cpp b/source/code/main.cpp
index e84e70e..1ebb55d 100644
--- a/source/code/main.cpp
+++ b/source/code/main.cpp
@@ -21,6 +21,8 @@ https://blockattack.net
 ===========================================================================
 */
 
+#include "MenuSystem.h"
+#include "replayhandler.hpp"
 #include "common.h"
 #include "global.hpp"
 #include "scopeHelpers.hpp"
@@ -47,7 +49,6 @@ https://blockattack.net
 #include <SDL_image.h>      //To load PNG images!
 #include <physfs.h>         //Abstract file system. To use containers
 #include <vector>
-#include "MenuSystem.h"
 #include "puzzlehandler.hpp"
 #include "stageclearhandler.hpp"
 #include <memory>
@@ -56,7 +57,7 @@ https://blockattack.net
 #include "highscore.h"      //Stores highscores
 #include "ReadKeyboard.h"   //Reads text from keyboard
 #include "stats.h"          //Saves general stats
-#include "replayhandler.hpp"
+
 
 #include "common.h"
 #include "gamecontroller.h"