diff --git a/CCallback.cpp b/CCallback.cpp
index 2ba1de968..be73bb6f4 100644
--- a/CCallback.cpp
+++ b/CCallback.cpp
@@ -12,7 +12,7 @@
 #include "hch/CObjectHandler.h"
 #include "lib/Connection.h"
 #include "lib/NetPacks.h"
-#include "mapHandler.h"
+#include "client/mapHandler.h"
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
diff --git a/client/CMT.cpp b/client/CMT.cpp
index 81f6658ba..b19443ec6 100644
--- a/client/CMT.cpp
+++ b/client/CMT.cpp
@@ -13,7 +13,7 @@
 #include "SDL_Extensions.h"
 #include "SDL_framerate.h"
 #include "CGameInfo.h"
-#include "../mapHandler.h"
+#include "mapHandler.h"
 #include "../global.h"
 #include "CPreGame.h"
 #include "CCastleInterface.h"
diff --git a/client/GUIClasses.cpp b/client/GUIClasses.cpp
index 4beafa8aa..62385d93a 100644
--- a/client/GUIClasses.cpp
+++ b/client/GUIClasses.cpp
@@ -25,7 +25,7 @@
 #include "../hch/CTownHandler.h"
 #include "../lib/CondSh.h"
 #include "../lib/map.h"
-#include "../mapHandler.h"
+#include "mapHandler.h"
 #include "../timeHandler.h"
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/client/NetPacksClient.cpp b/client/NetPacksClient.cpp
index 7ef1fc3ea..504888238 100644
--- a/client/NetPacksClient.cpp
+++ b/client/NetPacksClient.cpp
@@ -13,7 +13,7 @@
 #include "../lib/VCMIDirs.h"
 #include "../hch/CSpellHandler.h"
 #include "../hch/CSoundBase.h"
-#include "../mapHandler.h"
+#include "mapHandler.h"
 #include "GUIClasses.h"
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
diff --git a/mapHandler.cpp b/client/mapHandler.cpp
similarity index 95%
rename from mapHandler.cpp
rename to client/mapHandler.cpp
index b23abfb51..2e3a91a4d 100644
--- a/mapHandler.cpp
+++ b/client/mapHandler.cpp
@@ -1,23 +1,23 @@
-#include "stdafx.h"
+#include "../stdafx.h"
 #include "mapHandler.h"
-#include "client/SDL_Extensions.h"
-#include "client/CGameInfo.h"
+#include "SDL_Extensions.h"
+#include "CGameInfo.h"
 #include <cstdlib>
-#include "hch/CLodHandler.h"
-#include "hch/CDefObjInfoHandler.h"
+#include "../hch/CLodHandler.h"
+#include "../hch/CDefObjInfoHandler.h"
 #include <algorithm>
-#include "lib/CGameState.h"
-#include "hch/CHeroHandler.h"
-#include "hch/CTownHandler.h"
-#include "client/Graphics.h"
+#include "../lib/CGameState.h"
+#include "../hch/CHeroHandler.h"
+#include "../hch/CTownHandler.h"
+#include "Graphics.h"
 #include <iomanip>
 #include <sstream>
-#include "hch/CObjectHandler.h"
-#include "lib/map.h"
-#include "hch/CDefHandler.h"
-#include "client/CConfigHandler.h"
+#include "../hch/CObjectHandler.h"
+#include "../lib/map.h"
+#include "../hch/CDefHandler.h"
+#include "CConfigHandler.h"
 #include <boost/assign/list_of.hpp>
-#include "hch/CGeneralTextHandler.h"
+#include "../hch/CGeneralTextHandler.h"
 
 /*
  * mapHandler.cpp, part of VCMI engine
diff --git a/mapHandler.h b/client/mapHandler.h
similarity index 96%
rename from mapHandler.h
rename to client/mapHandler.h
index 429706ea7..95004aeb6 100644
--- a/mapHandler.h
+++ b/client/mapHandler.h
@@ -1,6 +1,6 @@
 #ifndef __MAPHANDLER_H__
 #define __MAPHANDLER_H__
-#include "global.h"
+#include "../global.h"
 #include <list>
 #include <set>