5 files changed, 11 insertions, 8 deletions
diff --git a/src/common/Collision/Management/VMapManager2.cpp b/src/common/Collision/Management/VMapManager2.cpp
index 0c559484393..694a8e13bf9 100644
--- a/src/common/Collision/Management/VMapManager2.cpp
+++ b/src/common/Collision/Management/VMapManager2.cpp
@@ -32,6 +32,12 @@ using G3D::Vector3;
 
 namespace VMAP
 {
+    bool readChunk(FILE* rf, char* dest, const char* compare, uint32 len)
+    {
+        if (fread(dest, sizeof(char), len, rf) != len) return false;
+        return memcmp(dest, compare, len) == 0;
+    }
+
     VMapManager2::VMapManager2()
     {
         GetLiquidFlagsPtr = &GetLiquidFlagsDummy;
diff --git a/src/common/Collision/VMapDefinitions.h b/src/common/Collision/VMapDefinitions.h
index b31ab96a290..2a8938d1fd8 100644
--- a/src/common/Collision/VMapDefinitions.h
+++ b/src/common/Collision/VMapDefinitions.h
@@ -28,7 +28,7 @@ namespace VMAP
     const char RAW_VMAP_MAGIC[] = "VMAP048";                // used in extracted vmap files with raw data
     const char GAMEOBJECT_MODELS[] = "GameObjectModels.dtree";
 
-    // defined in TileAssembler.cpp currently...
+    // defined in VMapManager2.cpp currently...
     bool readChunk(FILE* rf, char *dest, const char *compare, uint32 len);
 }
 
diff --git a/src/tools/vmap4_assembler/CMakeLists.txt b/src/tools/vmap4_assembler/CMakeLists.txt
index a554682cdb5..803fd35b188 100644
--- a/src/tools/vmap4_assembler/CMakeLists.txt
+++ b/src/tools/vmap4_assembler/CMakeLists.txt
@@ -8,7 +8,10 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-set(PRIVATE_SOURCES VMapAssembler.cpp)
+set(PRIVATE_SOURCES
+  TileAssembler.cpp
+  TileAssembler.h
+  VMapAssembler.cpp)
 
 if (WIN32)
   list(APPEND PRIVATE_SOURCES ${sources_windows})
diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/tools/vmap4_assembler/TileAssembler.cpp
index 0a50ef21e40..0fb597cb59e 100644
--- a/src/common/Collision/Maps/TileAssembler.cpp
+++ b/src/tools/vmap4_assembler/TileAssembler.cpp
@@ -37,12 +37,6 @@ template<> struct BoundsTrait<VMAP::ModelSpawn*>
 
 namespace VMAP
 {
-    bool readChunk(FILE* rf, char *dest, const char *compare, uint32 len)
-    {
-        if (fread(dest, sizeof(char), len, rf) != len) return false;
-        return memcmp(dest, compare, len) == 0;
-    }
-
     Vector3 ModelPosition::transform(const Vector3& pIn) const
     {
         Vector3 out = pIn * iScale;
diff --git a/src/common/Collision/Maps/TileAssembler.h b/src/tools/vmap4_assembler/TileAssembler.h
index ef0f4b2adc8..ef0f4b2adc8 100644
--- a/src/common/Collision/Maps/TileAssembler.h
+++ b/src/tools/vmap4_assembler/TileAssembler.h