diff --git a/apps/openmw/mwgui/layouts.cpp b/apps/openmw/mwgui/layouts.cpp
index de74214eef..af068ffae1 100644
--- a/apps/openmw/mwgui/layouts.cpp
+++ b/apps/openmw/mwgui/layouts.cpp
@@ -181,99 +181,6 @@ void HUD::setPlayerPos(const float x, const float y)
     compass->setPosition(MyGUI::IntPoint(x*512-16, y*512-16));
 }
 
-MapWindow::MapWindow()
-  : Layout("openmw_map_window_layout.xml")
-  , mGlobal(false)
-  , mVisible(false)
-{
-    setCoord(500,0,320,300);
-    setText("WorldButton", "World");
-    setImage("Compass", "textures\\compass.dds");
-
-    // Obviously you should override this later on
-    setCellName("No Cell Loaded");
-
-    getWidget(mLocalMap, "LocalMap");
-    getWidget(mGlobalMap, "GlobalMap");
-    getWidget(mPlayerArrow, "Compass");
-
-    getWidget(mButton, "WorldButton");
-    mButton->eventMouseButtonClick += MyGUI::newDelegate(this, &MapWindow::onWorldButtonClicked);
-
-    MyGUI::Button* eventbox;
-    getWidget(eventbox, "EventBox");
-    eventbox->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
-    eventbox->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
-
-    LocalMapBase::init(mLocalMap, this);
-}
-
-void MapWindow::setVisible(bool b)
-{
-    mMainWidget->setVisible(b);
-    if (b)
-        mVisible = true;
-    else
-        mVisible = false;
-}
-
-void MapWindow::setCellName(const std::string& cellName)
-{
-    static_cast<MyGUI::Window*>(mMainWidget)->setCaption(cellName);
-    adjustWindowCaption();
-}
-
-void MapWindow::setPlayerPos(const float x, const float y)
-{
-    if (mGlobal || mVisible) return;
-    MyGUI::IntSize size = mLocalMap->getCanvasSize();
-    MyGUI::IntPoint middle = MyGUI::IntPoint((1/3.f + x/3.f)*size.width,(1/3.f + y/3.f)*size.height);
-    MyGUI::IntCoord viewsize = mLocalMap->getCoord();
-    MyGUI::IntPoint pos(0.5*viewsize.width - middle.left, 0.5*viewsize.height - middle.top);
-    mLocalMap->setViewOffset(pos);
-
-    mPlayerArrow->setPosition(MyGUI::IntPoint(x*512-16, y*512-16));
-}
-
-void MapWindow::setPlayerDir(const float x, const float y)
-{
-    if (!mVisible) return;
-    MyGUI::ISubWidget* main = mPlayerArrow->getSubWidgetMain();
-    MyGUI::RotatingSkin* rotatingSubskin = main->castType<MyGUI::RotatingSkin>();
-    rotatingSubskin->setCenter(MyGUI::IntPoint(16,16));
-    float angle = std::atan2(x,y);
-    rotatingSubskin->setAngle(angle);
-}
-
-void MapWindow::onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
-{
-    if (_id!=MyGUI::MouseButton::Left) return;
-    if (!mGlobal)
-        mLastDragPos = MyGUI::IntPoint(_left, _top);
-}
-
-void MapWindow::onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
-{
-    if (_id!=MyGUI::MouseButton::Left) return;
-
-    if (!mGlobal)
-    {
-        MyGUI::IntPoint diff = MyGUI::IntPoint(_left, _top) - mLastDragPos;
-        mLocalMap->setViewOffset( mLocalMap->getViewOffset() + diff );
-
-        mLastDragPos = MyGUI::IntPoint(_left, _top);
-    }
-}
-
-void MapWindow::onWorldButtonClicked(MyGUI::Widget* _sender)
-{
-    mGlobal = !mGlobal;
-    mGlobalMap->setVisible(mGlobal);
-    mLocalMap->setVisible(!mGlobal);
-
-    mButton->setCaption( mGlobal ? "Local" : "World" );
-}
-
 LocalMapBase::LocalMapBase()
     : mCurX(0)
     , mCurY(0)
diff --git a/apps/openmw/mwgui/layouts.hpp b/apps/openmw/mwgui/layouts.hpp
index 614479ccce..30bea579c5 100644
--- a/apps/openmw/mwgui/layouts.hpp
+++ b/apps/openmw/mwgui/layouts.hpp
@@ -82,30 +82,6 @@ namespace MWGui
     MyGUI::TextBox* batchcounter;
   };
 
-  class MapWindow : public OEngine::GUI::Layout, public LocalMapBase
-  {
-  public:
-    MapWindow();
-    virtual ~MapWindow(){}
-
-    void setVisible(bool b);
-    void setPlayerPos(const float x, const float y);
-    void setPlayerDir(const float x, const float y);
-    void setCellName(const std::string& cellName);
-  
-  private:
-    void onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
-    void onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
-    void onWorldButtonClicked(MyGUI::Widget* _sender);
-
-    MyGUI::ScrollView* mGlobalMap;
-    MyGUI::ImageBox* mPlayerArrow;
-    MyGUI::Button* mButton;
-    MyGUI::IntPoint mLastDragPos;
-    bool mVisible;
-    bool mGlobal;
-  };
-
   class MainMenu : public OEngine::GUI::Layout
   {
   public:
diff --git a/apps/openmw/mwgui/map_window.cpp b/apps/openmw/mwgui/map_window.cpp
new file mode 100644
index 0000000000..631f61c9d7
--- /dev/null
+++ b/apps/openmw/mwgui/map_window.cpp
@@ -0,0 +1,104 @@
+#include "map_window.hpp"
+/*
+#include "../mwmechanics/mechanicsmanager.hpp"
+#include "window_manager.hpp"
+
+#include <cmath>
+#include <algorithm>
+#include <iterator>
+
+#undef min
+#undef max
+*/
+using namespace MWGui;
+
+MapWindow::MapWindow(WindowManager& parWindowManager) : 
+    MWGui::WindowPinnableBase("openmw_map_window_layout.xml", parWindowManager),
+    mGlobal(false), 
+    mVisible(false)
+{
+    setCoord(500,0,320,300);
+    setText("WorldButton", "World");
+    setImage("Compass", "textures\\compass.dds");
+
+    // Obviously you should override this later on
+    setCellName("No Cell Loaded");
+
+    getWidget(mLocalMap, "LocalMap");
+    getWidget(mGlobalMap, "GlobalMap");
+    getWidget(mPlayerArrow, "Compass");
+
+    getWidget(mButton, "WorldButton");
+    mButton->eventMouseButtonClick += MyGUI::newDelegate(this, &MapWindow::onWorldButtonClicked);
+
+    MyGUI::Button* eventbox;
+    getWidget(eventbox, "EventBox");
+    eventbox->eventMouseDrag += MyGUI::newDelegate(this, &MapWindow::onMouseDrag);
+    eventbox->eventMouseButtonPressed += MyGUI::newDelegate(this, &MapWindow::onDragStart);
+
+    LocalMapBase::init(mLocalMap, this);
+}
+
+void MapWindow::setVisible(bool b)
+{
+    WindowPinnableBase::setVisible(b);
+    mVisible = b;
+}
+
+void MapWindow::setCellName(const std::string& cellName)
+{
+    static_cast<MyGUI::Window*>(mMainWidget)->setCaption(cellName);
+    adjustWindowCaption();
+}
+
+void MapWindow::setPlayerPos(const float x, const float y)
+{
+    if (mGlobal || mVisible) return;
+    MyGUI::IntSize size = mLocalMap->getCanvasSize();
+    MyGUI::IntPoint middle = MyGUI::IntPoint((1/3.f + x/3.f)*size.width,(1/3.f + y/3.f)*size.height);
+    MyGUI::IntCoord viewsize = mLocalMap->getCoord();
+    MyGUI::IntPoint pos(0.5*viewsize.width - middle.left, 0.5*viewsize.height - middle.top);
+    mLocalMap->setViewOffset(pos);
+
+    mPlayerArrow->setPosition(MyGUI::IntPoint(x*512-16, y*512-16));
+}
+
+void MapWindow::setPlayerDir(const float x, const float y)
+{
+    if (!mVisible) return;
+    MyGUI::ISubWidget* main = mPlayerArrow->getSubWidgetMain();
+    MyGUI::RotatingSkin* rotatingSubskin = main->castType<MyGUI::RotatingSkin>();
+    rotatingSubskin->setCenter(MyGUI::IntPoint(16,16));
+    float angle = std::atan2(x,y);
+    rotatingSubskin->setAngle(angle);
+}
+
+void MapWindow::onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+{
+    if (_id!=MyGUI::MouseButton::Left) return;
+    if (!mGlobal)
+        mLastDragPos = MyGUI::IntPoint(_left, _top);
+}
+
+void MapWindow::onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id)
+{
+    if (_id!=MyGUI::MouseButton::Left) return;
+
+    if (!mGlobal)
+    {
+        MyGUI::IntPoint diff = MyGUI::IntPoint(_left, _top) - mLastDragPos;
+        mLocalMap->setViewOffset( mLocalMap->getViewOffset() + diff );
+
+        mLastDragPos = MyGUI::IntPoint(_left, _top);
+    }
+}
+
+void MapWindow::onWorldButtonClicked(MyGUI::Widget* _sender)
+{
+    mGlobal = !mGlobal;
+    mGlobalMap->setVisible(mGlobal);
+    mLocalMap->setVisible(!mGlobal);
+
+    mButton->setCaption( mGlobal ? "Local" : "World" );
+}
+
diff --git a/apps/openmw/mwgui/map_window.hpp b/apps/openmw/mwgui/map_window.hpp
new file mode 100644
index 0000000000..2fdc0d91ab
--- /dev/null
+++ b/apps/openmw/mwgui/map_window.hpp
@@ -0,0 +1,33 @@
+#ifndef MWGUI_MAPWINDOW_H
+#define MWGUI_MAPWINDOW_H
+
+#include "layouts.hpp"
+#include "window_pinnable_base.hpp"
+
+namespace MWGui
+{
+    class MapWindow : public MWGui::WindowPinnableBase, public LocalMapBase
+    {
+    public:
+        MapWindow(WindowManager& parWindowManager);
+        virtual ~MapWindow(){}
+
+        void setVisible(bool b);
+        void setPlayerPos(const float x, const float y);
+        void setPlayerDir(const float x, const float y);
+        void setCellName(const std::string& cellName);
+  
+    private:
+        void onDragStart(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onMouseDrag(MyGUI::Widget* _sender, int _left, int _top, MyGUI::MouseButton _id);
+        void onWorldButtonClicked(MyGUI::Widget* _sender);
+
+        MyGUI::ScrollView* mGlobalMap;
+        MyGUI::ImageBox* mPlayerArrow;
+        MyGUI::Button* mButton;
+        MyGUI::IntPoint mLastDragPos;
+        bool mVisible;
+        bool mGlobal;
+    };
+}
+#endif
diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp
index 49b6e644d3..4d7b9f9013 100644
--- a/apps/openmw/mwgui/window_manager.cpp
+++ b/apps/openmw/mwgui/window_manager.cpp
@@ -4,6 +4,7 @@
 #include "review.hpp"
 #include "dialogue.hpp"
 #include "dialogue_history.hpp"
+#include "map_window.hpp"
 #include "stats_window.hpp"
 #include "messagebox.hpp"
 
@@ -71,7 +72,7 @@ WindowManager::WindowManager(MWWorld::Environment& environment,
 
     hud = new HUD(w,h, showFPSLevel);
     menu = new MainMenu(w,h);
-    map = new MapWindow();
+    map = new MapWindow(*this);
     stats = new StatsWindow(*this);
     console = new Console(w,h, environment, extensions);
     mJournal = new JournalWindow(*this);