diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 84be793bb44..d4db0591a30 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -16,9 +16,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _CRT_SECURE_NO_DEPRECATE
-#define WIN32_LEAN_AND_MEAN
-
 #include "Banner.h"
 #include "CascHandles.h"
 #include "Common.h"
@@ -35,6 +32,7 @@
 #include <deque>
 #include <fstream>
 #include <set>
+#include <unordered_map>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/src/tools/map_extractor/adt.h b/src/tools/map_extractor/adt.h
index b11a0613023..468ac299149 100644
--- a/src/tools/map_extractor/adt.h
+++ b/src/tools/map_extractor/adt.h
@@ -19,7 +19,7 @@
 #ifndef ADT_H
 #define ADT_H
 
-#include "loadlib.h"
+#include "Define.h"
 
 #define TILESIZE (533.33333f)
 #define CHUNKSIZE ((TILESIZE) / 16.0f)
diff --git a/src/tools/mmaps_generator/PathCommon.h b/src/tools/mmaps_generator/PathCommon.h
index 67a02b3aa90..041a1ee9ab1 100644
--- a/src/tools/mmaps_generator/PathCommon.h
+++ b/src/tools/mmaps_generator/PathCommon.h
@@ -19,18 +19,19 @@
 #ifndef _MMAP_COMMON_H
 #define _MMAP_COMMON_H
 
+#include "Common.h"
 #include <string>
 #include <vector>
 
-#include "Common.h"
-
 #ifndef _WIN32
-    #include <stddef.h>
+    #include <cstddef>
     #include <dirent.h>
+#else
+    #include <Windows.h>
 #endif
 
 #ifdef __linux__
-    #include <errno.h>
+    #include <cerrno>
 #endif
 
 enum NavTerrain
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 422aeb2e61c..1f791ccf7bb 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -16,9 +16,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define _CRT_SECURE_NO_DEPRECATE
-#define WIN32_LEAN_AND_MEAN
-
 #include "adtfile.h"
 #include "Banner.h"
 #include "Common.h"
@@ -35,17 +32,16 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <unordered_map>
 #include <vector>
 #include <cstdio>
 #include <cerrno>
+#include <sys/stat.h>
 
 #ifdef WIN32
-    #include <Windows.h>
-    #include <sys/stat.h>
     #include <direct.h>
     #define mkdir _mkdir
 #else
-    #include <sys/stat.h>
     #define ERROR_PATH_NOT_FOUND ERROR_FILE_NOT_FOUND
 #endif