8 files changed, 19 insertions, 49 deletions
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index ce5e54ac4f0..a18ee7cd517 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -10,41 +10,11 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 file(GLOB sources *.cpp)
-file(GLOB loadlib_sources loadlib/*.cpp)
 
 include_directories (
   ${CMAKE_SOURCE_DIR}/src/server/shared
-  ${CMAKE_SOURCE_DIR}/externals/libmpq
   ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_SOURCE_DIR}/loadlib
-)
-
-link_directories(
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq
-  ${CMAKE_CURRENT_SOURCE_DIR}}/loadlib
-)
-
-add_library(loadlib
-  ${loadlib_sources}
-)
-
-if(NOT UNIX)
-  target_link_libraries(loadlib
-    zlib
-  )
-else()
-  target_link_libraries(loadlib
-    ${ZLIB_LIBRARIES}
-  )
-endif()
-
-add_library(libmpq
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/common.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/explode.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/extract.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/huffman.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/mpq.c
-  ${CMAKE_SOURCE_DIR}/externals/libmpq/libmpq/wave.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/loadlib
 )
 
 add_executable(mapextractor
@@ -53,14 +23,12 @@ add_executable(mapextractor
 
 if(WIN32)
   target_link_libraries(mapextractor
-    libmpq
-    loadlib
+    mpq
     bzip2
   )
 else()
   target_link_libraries(mapextractor
-    libmpq
-    loadlib
+    mpq
     ${BZIP2_LIBRARIES}
   )
 endif()
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index 3a328e91bf4..2640b65d8b1 100644..100755
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -14,8 +14,8 @@
 #include "dbcfile.h"
 #include "mpq_libmpq04.h"
 
-#include "loadlib/adt.h"
-#include "loadlib/wdt.h"
+#include "adt.h"
+#include "wdt.h"
 #include <fcntl.h>
 
 #if defined( __GNUC__ )
diff --git a/src/tools/map_extractor/loadlib/adt.cpp b/src/tools/map_extractor/adt.cpp
index fde70681113..fde70681113 100644
--- a/src/tools/map_extractor/loadlib/adt.cpp
+++ b/src/tools/map_extractor/adt.cpp
diff --git a/src/tools/map_extractor/loadlib/adt.h b/src/tools/map_extractor/adt.h
index 725c5b994ee..725c5b994ee 100644
--- a/src/tools/map_extractor/loadlib/adt.h
+++ b/src/tools/map_extractor/adt.h
diff --git a/src/tools/map_extractor/loadlib/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
index 465eb04083f..465eb04083f 100644
--- a/src/tools/map_extractor/loadlib/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib.cpp
diff --git a/src/tools/map_extractor/loadlib/loadlib.h b/src/tools/map_extractor/loadlib/loadlib.h
index 48fe794f8dc..49d5f590744 100644
--- a/src/tools/map_extractor/loadlib/loadlib.h
+++ b/src/tools/map_extractor/loadlib/loadlib.h
@@ -3,26 +3,28 @@
 
 #ifdef _WIN32
 typedef __int64            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef __int32            int32;
+typedef __int16            int16;
+typedef __int8             int8;
 typedef unsigned __int64   uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef unsigned __int32   uint32;
+typedef unsigned __int16   uint16;
+typedef unsigned __int8    uint8;
 #else
 #include <stdint.h>
 #ifndef uint64_t 
+#ifdef __linux__
 #include <linux/types.h> 
 #endif
+#endif
 typedef int64_t            int64;
-typedef long               int32;
-typedef short              int16;
-typedef char               int8;
+typedef int32_t            int32;
+typedef int16_t            int16;
+typedef int8_t             int8;
 typedef uint64_t           uint64;
-typedef unsigned long      uint32;
-typedef unsigned short     uint16;
-typedef unsigned char      uint8;
+typedef uint32_t           uint32;
+typedef uint16_t           uint16;
+typedef uint8_t            uint8;
 #endif
 
 #define FILE_FORMAT_VERSION    18
diff --git a/src/tools/map_extractor/loadlib/wdt.cpp b/src/tools/map_extractor/wdt.cpp
index dedefbb64e5..dedefbb64e5 100644
--- a/src/tools/map_extractor/loadlib/wdt.cpp
+++ b/src/tools/map_extractor/wdt.cpp
diff --git a/src/tools/map_extractor/loadlib/wdt.h b/src/tools/map_extractor/wdt.h
index fcee8ac64f2..fcee8ac64f2 100644
--- a/src/tools/map_extractor/loadlib/wdt.h
+++ b/src/tools/map_extractor/wdt.h