diff --git a/dep b/dep
index 0f87f738..6893d7d4 160000
--- a/dep
+++ b/dep
@@ -1 +1 @@
-Subproject commit 0f87f738f67e1d421647089ae51ba2eabde1deb6
+Subproject commit 6893d7d4a3717e15364b1a63ba06df371aa382e8
diff --git a/src/tools/map-extractor/System.cpp b/src/tools/map-extractor/System.cpp
index 21670216..6c6ccf20 100644
--- a/src/tools/map-extractor/System.cpp
+++ b/src/tools/map-extractor/System.cpp
@@ -34,10 +34,10 @@
 #endif
 
 #include "dbcfile.h"
-#include "mpq_libmpq.h"
+#include <ml\mpq.h>
 
-#include <adt.h>
-#include <wdt.h>
+#include <ml\adt.h>
+#include <ml\wdt.h>
 #include <fcntl.h>
 
 #ifndef WIN32
diff --git a/src/tools/map-extractor/dbcfile.cpp b/src/tools/map-extractor/dbcfile.cpp
index bafbc470..2f19b6e3 100644
--- a/src/tools/map-extractor/dbcfile.cpp
+++ b/src/tools/map-extractor/dbcfile.cpp
@@ -25,7 +25,7 @@
 #include "dbcfile.h"
 #undef min
 #undef max
-#include "mpq_libmpq.h"
+#include <ml\mpq.h>
 
 #include <cstdio>
 
diff --git a/src/tools/vmap-extractor/adtfile.h b/src/tools/vmap-extractor/adtfile.h
index bf2158b2..11e30b8f 100644
--- a/src/tools/vmap-extractor/adtfile.h
+++ b/src/tools/vmap-extractor/adtfile.h
@@ -26,7 +26,7 @@
 #define ADT_H
 
 #include <libmpq/mpq.h>
-#include "mpq_libmpq.h"
+#include <ml/mpq.h>
 #include "wmo.h"
 #include "vmapexport.h"
 #include "model.h"
diff --git a/src/tools/vmap-extractor/dbcfile.cpp b/src/tools/vmap-extractor/dbcfile.cpp
index bafbc470..c7ade441 100644
--- a/src/tools/vmap-extractor/dbcfile.cpp
+++ b/src/tools/vmap-extractor/dbcfile.cpp
@@ -25,7 +25,7 @@
 #include "dbcfile.h"
 #undef min
 #undef max
-#include "mpq_libmpq.h"
+#include <ml/mpq.h>
 
 #include <cstdio>
 
diff --git a/src/tools/vmap-extractor/model.cpp b/src/tools/vmap-extractor/model.cpp
index e11451f0..4d5b720c 100644
--- a/src/tools/vmap-extractor/model.cpp
+++ b/src/tools/vmap-extractor/model.cpp
@@ -22,7 +22,7 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "mpq_libmpq.h"
+#include <ml\mpq.h>
 #include "vmapexport.h"
 #include "model.h"
 #include "wmo.h"
diff --git a/src/tools/vmap-extractor/model.h b/src/tools/vmap-extractor/model.h
index c1a38461..2b76fb90 100644
--- a/src/tools/vmap-extractor/model.h
+++ b/src/tools/vmap-extractor/model.h
@@ -25,7 +25,7 @@
 #ifndef MODEL_H
 #define MODEL_H
 
-#include "loadlib.h"
+#include <ml\loadlib.h>
 #include "vec3d.h"
 #include "modelheaders.h"
 #include <vector>
diff --git a/src/tools/vmap-extractor/vmapexport.cpp b/src/tools/vmap-extractor/vmapexport.cpp
index d00f2445..568a1871 100644
--- a/src/tools/vmap-extractor/vmapexport.cpp
+++ b/src/tools/vmap-extractor/vmapexport.cpp
@@ -50,7 +50,7 @@
 #include "wdtfile.h"
 #include "dbcfile.h"
 #include "wmo.h"
-#include "mpq_libmpq.h"
+#include <ml\mpq.h>
 
 #include "vmapexport.h"
 
diff --git a/src/tools/vmap-extractor/wdtfile.h b/src/tools/vmap-extractor/wdtfile.h
index 20066c12..5c1e69c4 100644
--- a/src/tools/vmap-extractor/wdtfile.h
+++ b/src/tools/vmap-extractor/wdtfile.h
@@ -25,7 +25,7 @@
 #ifndef WDTFILE_H
 #define WDTFILE_H
 
-#include "mpq_libmpq.h"
+#include <ml/mpq.h>
 #include "wmo.h"
 #include <string>
 #include "stdlib.h"
diff --git a/src/tools/vmap-extractor/wmo.cpp b/src/tools/vmap-extractor/wmo.cpp
index c2e6ad31..6717f8d8 100644
--- a/src/tools/vmap-extractor/wmo.cpp
+++ b/src/tools/vmap-extractor/wmo.cpp
@@ -32,7 +32,7 @@
 #include <fstream>
 #undef min
 #undef max
-#include "mpq_libmpq.h"
+#include <ml\mpq.h>
 
 using namespace std;
 extern uint16* LiqType;
diff --git a/src/tools/vmap-extractor/wmo.h b/src/tools/vmap-extractor/wmo.h
index 33d8d0fa..5c6eb0e1 100644
--- a/src/tools/vmap-extractor/wmo.h
+++ b/src/tools/vmap-extractor/wmo.h
@@ -31,7 +31,7 @@
 #include <string>
 #include <set>
 #include "vec3d.h"
-#include <loadlib.h>
+#include <ml\loadlib.h>
 
 // MOPY flags
 #define WMO_MATERIAL_NOCAMCOLLIDE    0x01