diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp
index 81d545a85..4f74ad7bd 100644
--- a/apps/openmw/mwmp/GUIController.cpp
+++ b/apps/openmw/mwmp/GUIController.cpp
@@ -2,38 +2,39 @@
 // Created by koncord on 20.07.16.
 //
 
+#include <components/openmw-mp/Log.hpp>
+#include <components/openmw-mp/Base/BasePlayer.hpp>
+
 #include <SDL_system.h>
+
+#include <MyGUI_FactoryManager.h>
+#include <MyGUI_Gui.h>
+#include <MyGUI_ImageBox.h>
 #include <MyGUI_InputManager.h>
+#include <MyGUI_LanguageManager.h>
+#include <MyGUI_RenderManager.h>
+#include <MyGUI_RotatingSkin.h>
+#include <MyGUI_ScrollView.h>
+#include <MyGUI_TextIterator.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/inputmanager.hpp"
-#include "../mwworld/worldimp.hpp"
-#include "../mwworld/player.hpp"
-#include "../mwworld/cellstore.hpp"
 
-#include <components/openmw-mp/Base/BasePlayer.hpp>
-#include <MyGUI_ScrollView.h>
-#include <MyGUI_ImageBox.h>
-#include <MyGUI_RenderManager.h>
-#include <MyGUI_Gui.h>
-#include <MyGUI_LanguageManager.h>
-#include <MyGUI_InputManager.h>
-#include <MyGUI_RotatingSkin.h>
-#include <MyGUI_FactoryManager.h>
 #include "../mwgui/mapwindow.hpp"
-#include <MyGUI_TextIterator.h>
-#include <components/openmw-mp/Log.hpp>
 
+#include "../mwworld/worldimp.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/cellstore.hpp"
 
 #include "GUIController.hpp"
 #include "Main.hpp"
-#include "PlayerMarkerCollection.hpp"
-#include "LocalPlayer.hpp"
 #include "Networking.hpp"
-#include "DedicatedPlayer.hpp"
+#include "PlayerMarkerCollection.hpp"
 #include "GUIDialogList.hpp"
 #include "GUIChat.hpp"
+#include "LocalPlayer.hpp"
+#include "DedicatedPlayer.hpp"
 
 
 mwmp::GUIController::GUIController(): mInputBox(0), mListBox(0)
diff --git a/apps/openmw/mwmp/GUIDialogList.cpp b/apps/openmw/mwmp/GUIDialogList.cpp
index 5c0111f4c..b6990d063 100644
--- a/apps/openmw/mwmp/GUIDialogList.cpp
+++ b/apps/openmw/mwmp/GUIDialogList.cpp
@@ -2,18 +2,19 @@
 // Created by koncord on 03.11.16.
 //
 
-#include "GUIDialogList.hpp"
-#include "Main.hpp"
-#include "LocalPlayer.hpp"
-#include "Networking.hpp"
+#include <components/openmw-mp/Log.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwgui/windowmanagerimp.hpp"
+
 #include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_ListBox.h>
 
-#include "../mwgui/windowmanagerimp.hpp"
-#include "../mwbase/environment.hpp"
-
-#include <components/openmw-mp/Log.hpp>
+#include "GUIDialogList.hpp"
+#include "Main.hpp"
+#include "Networking.hpp"
+#include "LocalPlayer.hpp"
 
 using namespace mwmp;
 
diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp
index 837d55b92..5a3ad72ee 100644
--- a/apps/openmw/mwmp/Main.cpp
+++ b/apps/openmw/mwmp/Main.cpp
@@ -2,31 +2,42 @@
 // Created by koncord on 01.01.16.
 //
 
-#include "Main.hpp"
-#include "../mwworld/manualref.hpp"
-#include "../mwmechanics/aitravel.hpp"
+#include <cstdlib>
+
+#include <components/openmw-mp/Log.hpp>
+#include <components/openmw-mp/Version.hpp>
+
 #include <components/esm/esmwriter.hpp>
+
 #include "../mwbase/environment.hpp"
-#include "../mwstate/statemanagerimp.hpp"
-#include "../mwinput/inputmanagerimp.hpp"
-#include "../mwscript/scriptmanagerimp.hpp"
+
+#include "../mwclass/creature.hpp"
+#include "../mwclass/npc.hpp"
+
+#include "../mwdialogue/dialoguemanagerimp.hpp"
+
 #include "../mwgui/windowmanagerimp.hpp"
-#include "../mwworld/worldimp.hpp"
-#include "../mwworld/ptr.hpp"
-#include "../mwworld/player.hpp"
-#include "../mwworld/customdata.hpp"
+
+#include "../mwinput/inputmanagerimp.hpp"
+
+#include "../mwmechanics/aitravel.hpp"
 #include "../mwmechanics/creaturestats.hpp"
-#include "../mwclass/npc.hpp"
-#include "../mwclass/creature.hpp"
 #include "../mwmechanics/mechanicsmanagerimp.hpp"
+#include "../mwmechanics/spellcasting.hpp"
+
+#include "../mwscript/scriptmanagerimp.hpp"
+
+#include "../mwstate/statemanagerimp.hpp"
+
 #include "../mwworld/cellstore.hpp"
-#include "../mwdialogue/dialoguemanagerimp.hpp"
+#include "../mwworld/customdata.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwmechanics/spellcasting.hpp"
-#include <components/openmw-mp/Log.hpp>
-#include <cstdlib>
-#include <components/openmw-mp/Version.hpp>
+#include "../mwworld/manualref.hpp"
+#include "../mwworld/player.hpp"
+#include "../mwworld/ptr.hpp"
+#include "../mwworld/worldimp.hpp"
 
+#include "Main.hpp"
 #include "Networking.hpp"
 #include "LocalPlayer.hpp"
 #include "DedicatedPlayer.hpp"