diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 816e9fd42..d578ad436 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -7,9 +7,10 @@
 #include <components/esm/loadmgef.hpp>
 #include <components/esm/loadnpc.hpp>
 #include <components/esm/npcstate.hpp>
-#include <apps/openmw/mwmp/DedicatedPlayer.hpp>
-#include <apps/openmw/mwmp/Networking.hpp>
-#include <apps/openmw/mwmp/Main.hpp>
+
+#include "../mwmp/DedicatedPlayer.hpp"
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/Main.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp
index 228cc88d6..22f9798bc 100644
--- a/apps/openmw/mwgui/mapwindow.cpp
+++ b/apps/openmw/mwgui/mapwindow.cpp
@@ -15,7 +15,8 @@
 #include <components/esm/esmwriter.hpp>
 #include <components/settings/settings.hpp>
 #include <components/myguiplatform/myguitexture.hpp>
-#include <apps/openmw/mwmp/Main.hpp>
+
+#include "../mwmp/Main.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 6b49cad69..73a8c8763 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -45,7 +45,8 @@
 #include <components/sdlutil/sdlcursormanager.hpp>
 
 #include <components/misc/resourcehelpers.hpp>
-#include <apps/openmw/mwmp/Main.hpp>
+
+#include "../mwmp/Main.hpp"
 
 #include "../mwbase/inputmanager.hpp"
 #include "../mwbase/statemanager.hpp"
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 5119ade47..67f38a264 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -17,7 +17,7 @@
 #include <components/sdlutil/sdlinputwrapper.hpp>
 #include <components/sdlutil/sdlvideowrapper.hpp>
 
-#include <apps/openmw/mwmp/Main.hpp>
+#include "../mwmp/Main.hpp"
 
 #include <components/esm/esmwriter.hpp>
 #include <components/esm/esmreader.hpp>
diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 95c275cb7..b2888990d 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -8,8 +8,9 @@
 #include <components/esm/loadnpc.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <apps/openmw/mwmp/Main.hpp>
-#include <apps/openmw/mwmp/DedicatedPlayer.hpp>
+
+#include "../mwmp/Main.hpp"
+#include "../mwmp/DedicatedPlayer.hpp"
 
 
 #include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index a84e2ae57..f378e8ad4 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -26,7 +26,8 @@
 #include <components/settings/settings.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <apps/openmw/mwmp/Main.hpp>
+
+#include "../mwmp/Main.hpp"
 
 #include "../mwrender/animation.hpp"
 
diff --git a/apps/openmw/mwmechanics/combat.cpp b/apps/openmw/mwmechanics/combat.cpp
index 4b90024de..bcfd1bd2f 100644
--- a/apps/openmw/mwmechanics/combat.cpp
+++ b/apps/openmw/mwmechanics/combat.cpp
@@ -3,9 +3,10 @@
 #include <components/misc/rng.hpp>
 
 #include <components/sceneutil/positionattitudetransform.hpp>
-#include <apps/openmw/mwmp/Networking.hpp>
-#include <apps/openmw/mwmp/Main.hpp>
-#include <apps/openmw/mwmp/DedicatedPlayer.hpp>
+
+#include "../mwmp/Networking.hpp"
+#include "../mwmp/Main.hpp"
+#include "../mwmp/DedicatedPlayer.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index b4a2daaa2..f10f8e0c8 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -7,8 +7,9 @@
 #include <boost/format.hpp>
 
 #include <components/misc/rng.hpp>
-#include <apps/openmw/mwmp/Main.hpp>
-#include <apps/openmw/mwmp/DedicatedPlayer.hpp>
+
+#include "../mwmp/Main.hpp"
+#include "../mwmp/DedicatedPlayer.hpp"
 
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/soundmanager.hpp"
diff --git a/apps/openmw/mwmp/DedicatedPlayer.cpp b/apps/openmw/mwmp/DedicatedPlayer.cpp
index f6a44976c..ed9649bb8 100644
--- a/apps/openmw/mwmp/DedicatedPlayer.cpp
+++ b/apps/openmw/mwmp/DedicatedPlayer.cpp
@@ -3,7 +3,7 @@
 //
 
 #include "DedicatedPlayer.hpp"
-#include <apps/openmw/mwmechanics/aitravel.hpp>
+#include "../mwmechanics/aitravel.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwstate/statemanagerimp.hpp"
 #include "../mwinput/inputmanagerimp.hpp"
@@ -19,7 +19,7 @@
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/action.hpp"
 #include "Main.hpp"
-#include <apps/openmw/mwworld/inventorystore.hpp>
+#include "../mwworld/inventorystore.hpp"
 #include <boost/algorithm/clamp.hpp>
 #include <components/openmw-mp/Log.hpp>
 using namespace mwmp;
diff --git a/apps/openmw/mwmp/DedicatedPlayer.hpp b/apps/openmw/mwmp/DedicatedPlayer.hpp
index 23d23b2e7..5f6d5e5d0 100644
--- a/apps/openmw/mwmp/DedicatedPlayer.hpp
+++ b/apps/openmw/mwmp/DedicatedPlayer.hpp
@@ -6,9 +6,9 @@
 #define OPENMW_PLAYER_HPP
 
 #include <components/esm/loadnpc.hpp>
-#include <apps/openmw/mwworld/manualref.hpp>
+#include "../mwworld/manualref.hpp"
 #include <map>
-#include <apps/openmw/mwmechanics/aisequence.hpp>
+#include "../mwmechanics/aisequence.hpp"
 #include <RakNetTypes.h>
 
 #include <components/openmw-mp/Base/BasePlayer.hpp>
diff --git a/apps/openmw/mwmp/GUIChat.cpp b/apps/openmw/mwmp/GUIChat.cpp
index a3c50f4ae..8f65cda51 100644
--- a/apps/openmw/mwmp/GUIChat.cpp
+++ b/apps/openmw/mwmp/GUIChat.cpp
@@ -5,13 +5,12 @@
 #include "GUIChat.hpp"
 
 #include <MyGUI_EditBox.h>
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwgui/windowmanagerimp.hpp>
-#include <apps/openmw/mwinput/inputmanagerimp.hpp>
+#include "../mwbase/environment.hpp"
+#include "../mwgui/windowmanagerimp.hpp"
+#include "../mwinput/inputmanagerimp.hpp"
 #include <MyGUI_InputManager.h>
 #include <components/openmw-mp/Log.hpp>
 
-#include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwworld/worldimp.hpp"
 #include "../mwworld/player.hpp"
diff --git a/apps/openmw/mwmp/GUIController.cpp b/apps/openmw/mwmp/GUIController.cpp
index cebb8b674..598faca45 100644
--- a/apps/openmw/mwmp/GUIController.cpp
+++ b/apps/openmw/mwmp/GUIController.cpp
@@ -4,12 +4,14 @@
 
 #include <SDL_system.h>
 #include <MyGUI_InputManager.h>
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/windowmanager.hpp>
-#include <apps/openmw/mwbase/inputmanager.hpp>
-#include <apps/openmw/mwworld/worldimp.hpp>
-#include <apps/openmw/mwworld/player.hpp>
-#include <apps/openmw/mwworld/cellstore.hpp>
+
+#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>
@@ -19,7 +21,7 @@
 #include <MyGUI_InputManager.h>
 #include <MyGUI_RotatingSkin.h>
 #include <MyGUI_FactoryManager.h>
-#include <apps/openmw/mwgui/mapwindow.hpp>
+#include "../mwgui/mapwindow.hpp"
 #include <MyGUI_TextIterator.h>
 #include <components/openmw-mp/Log.hpp>
 
diff --git a/apps/openmw/mwmp/GUIController.hpp b/apps/openmw/mwmp/GUIController.hpp
index 22105675e..898e63bb7 100644
--- a/apps/openmw/mwmp/GUIController.hpp
+++ b/apps/openmw/mwmp/GUIController.hpp
@@ -6,8 +6,10 @@
 #define OPENMW_GUICONTROLLER_HPP
 
 #include <components/settings/settings.hpp>
-#include <apps/openmw/mwgui/textinput.hpp>
-#include <apps/openmw/mwgui/mode.hpp>
+
+#include "../mwgui/textinput.hpp"
+#include "../mwgui/mode.hpp"
+
 #include <components/openmw-mp/Base/BasePlayer.hpp>
 #include "PlayerMarkerCollection.hpp"
 
diff --git a/apps/openmw/mwmp/GUIDialogList.cpp b/apps/openmw/mwmp/GUIDialogList.cpp
index 8c52e3771..42b19f675 100644
--- a/apps/openmw/mwmp/GUIDialogList.cpp
+++ b/apps/openmw/mwmp/GUIDialogList.cpp
@@ -7,8 +7,10 @@
 #include <MyGUI_EditBox.h>
 #include <MyGUI_Button.h>
 #include <MyGUI_ListBox.h>
-#include <apps/openmw/mwgui/windowmanagerimp.hpp>
-#include <apps/openmw/mwbase/environment.hpp>
+
+#include "../mwgui/windowmanagerimp.hpp"
+#include "../mwbase/environment.hpp"
+
 #include <components/openmw-mp/Log.hpp>
 
 using namespace mwmp;
diff --git a/apps/openmw/mwmp/GUIDialogList.hpp b/apps/openmw/mwmp/GUIDialogList.hpp
index 304cf3236..f144bebd8 100644
--- a/apps/openmw/mwmp/GUIDialogList.hpp
+++ b/apps/openmw/mwmp/GUIDialogList.hpp
@@ -6,7 +6,7 @@
 #define OPENMW_GUIDIALOGLIST_HPP
 
 
-#include <apps/openmw/mwgui/windowbase.hpp>
+#include "../mwgui/windowbase.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw/mwmp/LocalPlayer.cpp b/apps/openmw/mwmp/LocalPlayer.cpp
index 96ba27aee..285babe88 100644
--- a/apps/openmw/mwmp/LocalPlayer.cpp
+++ b/apps/openmw/mwmp/LocalPlayer.cpp
@@ -2,8 +2,8 @@
 // Created by koncord on 14.01.16.
 //
 
-#include <apps/openmw/mwworld/manualref.hpp>
-#include <apps/openmw/mwmechanics/aitravel.hpp>
+#include "../mwworld/manualref.hpp"
+#include "../mwmechanics/aitravel.hpp"
 #include <components/esm/esmwriter.hpp>
 #include "../mwbase/environment.hpp"
 #include "../mwstate/statemanagerimp.hpp"
@@ -18,10 +18,10 @@
 #include "../mwclass/creature.hpp"
 #include "../mwmechanics/mechanicsmanagerimp.hpp"
 #include "../mwworld/cellstore.hpp"
-#include <apps/openmw/mwdialogue/dialoguemanagerimp.hpp>
-#include <apps/openmw/mwworld/inventorystore.hpp>
-#include <apps/openmw/mwmechanics/spellcasting.hpp>
-#include <apps/openmw/mwgui/inventorywindow.hpp>
+#include "../mwdialogue/dialoguemanagerimp.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwmechanics/spellcasting.hpp"
+#include "../mwgui/inventorywindow.hpp"
 #include <components/openmw-mp/Log.hpp>
 #include <components/misc/rng.hpp>
 
diff --git a/apps/openmw/mwmp/LocalPlayer.hpp b/apps/openmw/mwmp/LocalPlayer.hpp
index 967d49cb7..0b99fc4d6 100644
--- a/apps/openmw/mwmp/LocalPlayer.hpp
+++ b/apps/openmw/mwmp/LocalPlayer.hpp
@@ -7,7 +7,7 @@
 
 #include <components/openmw-mp/Base/BasePlayer.hpp>
 #include <RakNetTypes.h>
-#include <apps/openmw/mwmp/Networking.hpp>
+#include "Networking.hpp"
 
 namespace mwmp
 {
diff --git a/apps/openmw/mwmp/Main.cpp b/apps/openmw/mwmp/Main.cpp
index 82263f63d..5b952090d 100644
--- a/apps/openmw/mwmp/Main.cpp
+++ b/apps/openmw/mwmp/Main.cpp
@@ -3,8 +3,8 @@
 //
 
 #include "Main.hpp"
-#include <apps/openmw/mwworld/manualref.hpp>
-#include <apps/openmw/mwmechanics/aitravel.hpp>
+#include "../mwworld/manualref.hpp"
+#include "../mwmechanics/aitravel.hpp"
 #include <components/esm/esmwriter.hpp>
 #include "../mwbase/environment.hpp"
 #include "../mwstate/statemanagerimp.hpp"
@@ -20,9 +20,9 @@
 #include "../mwclass/creature.hpp"
 #include "../mwmechanics/mechanicsmanagerimp.hpp"
 #include "../mwworld/cellstore.hpp"
-#include <apps/openmw/mwdialogue/dialoguemanagerimp.hpp>
-#include <apps/openmw/mwworld/inventorystore.hpp>
-#include <apps/openmw/mwmechanics/spellcasting.hpp>
+#include "../mwdialogue/dialoguemanagerimp.hpp"
+#include "../mwworld/inventorystore.hpp"
+#include "../mwmechanics/spellcasting.hpp"
 #include <components/openmw-mp/Log.hpp>
 #include <cstdlib>
 
diff --git a/apps/openmw/mwmp/Main.hpp b/apps/openmw/mwmp/Main.hpp
index 1c81514d3..1e6a158e4 100644
--- a/apps/openmw/mwmp/Main.hpp
+++ b/apps/openmw/mwmp/Main.hpp
@@ -1,4 +1,4 @@
-#include <apps/openmw/mwworld/ptr.hpp>
+#include "../mwworld/ptr.hpp"
 #include <boost/program_options.hpp>
 #include "Networking.hpp"
 #include "LocalPlayer.hpp"
diff --git a/apps/openmw/mwmp/Networking.cpp b/apps/openmw/mwmp/Networking.cpp
index 2540f9d77..337c42d75 100644
--- a/apps/openmw/mwmp/Networking.cpp
+++ b/apps/openmw/mwmp/Networking.cpp
@@ -7,18 +7,18 @@
 #include <string>
 #include <components/esm/cellid.hpp>
 
-#include <apps/openmw/mwbase/world.hpp>
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwbase/mechanicsmanager.hpp>
-#include <apps/openmw/mwbase/windowmanager.hpp>
-
-#include <apps/openmw/mwworld/cellstore.hpp>
-#include <apps/openmw/mwworld/esmstore.hpp>
-#include <apps/openmw/mwworld/inventorystore.hpp>
-
-#include <apps/openmw/mwclass/npc.hpp>
-#include <apps/openmw/mwmechanics/npcstats.hpp>
-#include <apps/openmw/mwmechanics/combat.hpp>
+#include "../mwbase/world.hpp"
+#include "../mwbase/environment.hpp"
+#include "../mwbase/mechanicsmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwworld/cellstore.hpp"
+#include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
+
+#include "../mwclass/npc.hpp"
+#include "../mwmechanics/npcstats.hpp"
+#include "../mwmechanics/combat.hpp"
 
 #include <SDL_messagebox.h>
 #include "Networking.hpp"
diff --git a/apps/openmw/mwmp/WorldController.cpp b/apps/openmw/mwmp/WorldController.cpp
index fa33eaf3f..32d2d4dfc 100644
--- a/apps/openmw/mwmp/WorldController.cpp
+++ b/apps/openmw/mwmp/WorldController.cpp
@@ -1,5 +1,5 @@
-#include <apps/openmw/mwbase/environment.hpp>
-#include <apps/openmw/mwworld/worldimp.hpp>
+#include "../mwbase/environment.hpp"
+#include "../mwworld/worldimp.hpp"
 #include <components/esm/cellid.hpp>
 #include <components/openmw-mp/Log.hpp>