3 files changed, 22 insertions, 18 deletions
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index eccefe624c7..cc374659afb 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -16,12 +16,6 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <deque>
-#include <set>
-#include <cstdlib>
-#include <fstream>
-
 #include "dbcfile.h"
 #include "Banner.h"
 #include "mpq_libmpq04.h"
@@ -29,6 +23,15 @@
 
 #include "adt.h"
 #include "wdt.h"
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <cstdio>
+#include <deque>
+#include <fstream>
+#include <set>
+#include <unordered_map>
+#include <cstdlib>
+#include <cstring>
 
 #include <G3D/Plane.h>
 #include <boost/filesystem.hpp>
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index 34730d05a1b..6ebbd0e211e 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -17,12 +17,21 @@
  */
 
 #include "adtfile.h"
-#include "wdtfile.h"
+#include "Banner.h"
 #include "dbcfile.h"
+#include "vmapexport.h"
+#include "wdtfile.h"
 #include "wmo.h"
 #include "mpq_libmpq04.h"
-#include "vmapexport.h"
-#include "Banner.h"
+#include <boost/filesystem/operations.hpp>
+#include <fstream>
+#include <iostream>
+#include <list>
+#include <map>
+#include <unordered_map>
+#include <vector>
+#include <cstdio>
+#include <cerrno>
 #include <sys/stat.h>
 
 #ifdef _WIN32
@@ -30,15 +39,6 @@
     #define mkdir _mkdir
 #endif
 
-#include <cstdio>
-#include <iostream>
-#include <map>
-#include <vector>
-#include <errno.h>
-
-#undef min
-#undef max
-
 //------------------------------------------------------------------------------
 // Defines
 
diff --git a/src/tools/vmap4_extractor/wmo.h b/src/tools/vmap4_extractor/wmo.h
index 5341daf6dcb..610a9978d99 100644
--- a/src/tools/vmap4_extractor/wmo.h
+++ b/src/tools/vmap4_extractor/wmo.h
@@ -22,6 +22,7 @@
 #include <string>
 #include <unordered_set>
 #include <vector>
+#include <memory>
 #include "vec3d.h"
 #include "loadlib/loadlib.h"