diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b8740c154..6e24ad433a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,16 +50,6 @@ source_group(components\\esm_store FILES ${ESM_STORE} ${ESM_STORE_HEADER})
 file(GLOB ESM_HEADER ${COMP_DIR}/esm/*.hpp)
 source_group(components\\esm FILES ${ESM_HEADER}) 
 
-# components/mw_gui
-set(MWGUI_HEADER
-    ${COMP_DIR}/mwgui/mw_layouts.hpp
-    ${COMP_DIR}/mwgui/window_manager.hpp
-)
-set(MWGUI
-    ${COMP_DIR}/mwgui/window_manager.cpp
-)
-source_group(components\\mwgui FILES ${MWGUI_HEADER} ${MWGUI})
-
 set(COMMANDSERVER
     ${COMP_DIR}/commandserver/command.hpp
     ${COMP_DIR}/commandserver/server.hpp
@@ -85,10 +75,10 @@ file(GLOB INTERPRETER_HEADER ${COMP_DIR}/interpreter/*.hpp)
 source_group(components\\interpreter FILES ${INTERPRETER} ${INTERPRETER_HEADER})    
 
 set(COMPONENTS ${BSA} ${NIF} ${NIFOGRE} ${ESM_STORE} ${MISC}
-    ${COMMANDSERVER} ${COMPILER} ${INTERPRETER} ${MWGUI})
+    ${COMMANDSERVER} ${COMPILER} ${INTERPRETER})
 set(COMPONENTS_HEADER ${BSA_HEADER} ${NIF_HEADER} ${NIFOGRE_HEADER} ${ESM_STORE_HEADER}
     ${ESM_HEADER} ${MISC_HEADER} ${COMPILER_HEADER}
-    ${INTERPRETER_HEADER} ${MWGUI_HEADER})
+    ${INTERPRETER_HEADER})
 
 # source directory: libs
 
diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 36eff8d0f3..93bd833cd2 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -30,6 +30,15 @@ set(GAMEINPUT_HEADER
     mwinput/inputmanager.hpp)
 source_group(apps\\openmw\\mwinput FILES ${GAMEINPUT} ${GAMEINPUT_HEADER})    
 
+set(GAMEGUI_HEADER
+    mwgui/mw_layouts.hpp
+    mwgui/window_manager.hpp
+)
+set(GAMEGUI
+    mwgui/window_manager.cpp
+)
+source_group(apps\\openmw\\mwgui FILES ${GAMEGUI_HEADER} ${GAMEGUI})
+
 set(GAMESCRIPT
     mwscript/scriptmanager.cpp
     mwscript/compilercontext.cpp
@@ -77,9 +86,9 @@ set(GAMEWORLD_HEADER
 source_group(apps\\openmw\\mwworld FILES ${GAMEWORLD} ${GAMEWORLD_HEADER}) 
 
 
-set(OPENMW_CPP ${GAME} ${GAMEREND} ${GAMEINPUT} ${GAMESCRIPT} ${GAMESOUND} ${GAMEGUI} ${GAMEWORLD})
+set(OPENMW_CPP ${GAME} ${GAMEREND} ${GAMEINPUT} ${GAMESCRIPT} ${GAMESOUND} ${GAMEGUI} ${GAMEWORLD} ${GAMEGUI})
 set(OPENMW_HEADER ${GAME_HEADER} ${GAMEREND_HEADER} ${GAMEINPUT_HEADER} ${GAMESCRIPT_HEADER}
-    ${GAMESOUND_HEADER} ${GAMEGUI_HEADER} ${GAMEWORLD_HEADER})
+    ${GAMESOUND_HEADER} ${GAMEGUI_HEADER} ${GAMEWORLD_HEADER} ${GAMEGUI_HEADER})
 
 # Main executable
 add_executable(openmw
diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 1edc72c88d..0ea6c9040d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -8,7 +8,7 @@
 #include <components/bsa/bsa_archive.hpp>
 
 #include <openengine/gui/manager.hpp>
-#include <components/mwgui/window_manager.hpp>
+#include "mwgui/window_manager.hpp"
 
 #include "mwinput/inputmanager.hpp"
 
diff --git a/components/mwgui/mw_layouts.hpp b/apps/openmw/mwgui/mw_layouts.hpp
similarity index 100%
rename from components/mwgui/mw_layouts.hpp
rename to apps/openmw/mwgui/mw_layouts.hpp
diff --git a/components/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp
similarity index 100%
rename from components/mwgui/window_manager.cpp
rename to apps/openmw/mwgui/window_manager.cpp
diff --git a/components/mwgui/window_manager.hpp b/apps/openmw/mwgui/window_manager.hpp
similarity index 100%
rename from components/mwgui/window_manager.hpp
rename to apps/openmw/mwgui/window_manager.hpp
diff --git a/apps/openmw/mwinput/inputmanager.cpp b/apps/openmw/mwinput/inputmanager.cpp
index 511c2519ed..cacedc6a74 100644
--- a/apps/openmw/mwinput/inputmanager.cpp
+++ b/apps/openmw/mwinput/inputmanager.cpp
@@ -9,7 +9,7 @@
 #include <openengine/ogre/mouselook.hpp>
 #include <openengine/ogre/renderer.hpp>
 
-#include <components/mwgui/window_manager.hpp>
+#include "../mwgui/window_manager.hpp"
 
 #include <mangle/input/servers/ois_driver.hpp>
 #include <mangle/input/filters/eventlist.hpp>
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index d3558b9864..4d389748d8 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -7,7 +7,7 @@
 #include <components/interpreter/runtime.hpp>
 #include <components/interpreter/opcodes.hpp>
 
-#include <components/mwgui/window_manager.hpp>
+#include "../mwgui/window_manager.hpp"
 
 #include "interpretercontext.hpp"
 
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index 7ea9e31165..52cdea1f15 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -9,7 +9,7 @@
 
 #include "../mwworld/world.hpp"
 
-#include <components/mwgui/window_manager.hpp>
+#include "../mwgui/window_manager.hpp"
 
 #include "locals.hpp"
 #include "globalscripts.hpp"
diff --git a/libs/openengine b/libs/openengine
index 82a3c071e5..c04d72cbe3 160000
--- a/libs/openengine
+++ b/libs/openengine
@@ -1 +1 @@
-Subproject commit 82a3c071e56f2df451618e1371424c39aa299690
+Subproject commit c04d72cbe380217c2d1d60f8a2c6e4810fe4c050