diff --git a/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h b/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h
index 6aeeb76f..c8fd7c04 100644
--- a/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h
+++ b/src/ObjLoading/Asset/GlobalAssetPoolsLoader.h
@@ -7,7 +7,7 @@ template<typename AssetType> class GlobalAssetPoolsLoader : public AssetCreator<
 public:
     static_assert(std::is_base_of_v<IAssetBase, AssetType>);
 
-    GlobalAssetPoolsLoader(Zone& zone)
+    explicit GlobalAssetPoolsLoader(Zone& zone)
         : m_zone(zone)
     {
     }
diff --git a/src/ZoneCode.lua b/src/ZoneCode.lua
index 1d418539..d1aa9200 100644
--- a/src/ZoneCode.lua
+++ b/src/ZoneCode.lua
@@ -225,6 +225,20 @@ function ZoneCode:allTestFiles()
     return result
 end
 
+function ZoneCode:allMarkFiles()
+    result = {}
+
+    for game, assets in pairs(self.Assets) do
+        for i, assetName in ipairs(assets) do
+            local assetNameLower = string.lower(assetName)
+            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.cpp")
+            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.h")
+        end
+    end
+    
+    return result
+end
+
 function ZoneCode:allLoadFiles()
     result = {}
 
@@ -233,8 +247,6 @@ function ZoneCode:allLoadFiles()
             local assetNameLower = string.lower(assetName)
             table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.cpp")
             table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_load_db.h")
-            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.cpp")
-            table.insert(result, "%{wks.location}/src/ZoneCode/Game/" .. game .. "/XAssets/" .. assetNameLower .. "/" .. assetNameLower .. "_mark_db.h")
         end
     end
     
diff --git a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
index f5add84c..c6a45bc2 100644
--- a/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
+++ b/src/ZoneCodeGeneratorLib/Generating/Templates/ZoneMarkTemplate.cpp
@@ -32,7 +32,7 @@ namespace
             LINE("#pragma once")
             LINE("")
             LINEF("#include \"Game/{0}/{0}.h\"", m_env.m_game)
-            LINE("#include \"Loading/AssetMarker.h\"")
+            LINE("#include \"Marking/AssetMarker.h\"")
             LINE("")
             LINE("#include <string>")
             LINE("")
diff --git a/src/ZoneCommon.lua b/src/ZoneCommon.lua
index bd887778..821006ce 100644
--- a/src/ZoneCommon.lua
+++ b/src/ZoneCommon.lua
@@ -43,9 +43,20 @@ function ZoneCommon:project()
 		
 		files {
 			path.join(folder, "ZoneCommon/**.h"), 
-			path.join(folder, "ZoneCommon/**.cpp") 
+			path.join(folder, "ZoneCommon/**.cpp"),
+			ZoneCode:allMarkFiles()
+		}
+		
+        vpaths {
+			["*"] = {
+				path.join(folder, "ZoneCommon"),
+				path.join(BuildFolder(), "src/ZoneCode")
+			}
 		}
 		
-		lzx:include(includes)
         self:include(includes)
+		lzx:include(includes)
+		ZoneCode:include(includes)
+
+		ZoneCode:use()
 end
diff --git a/src/ZoneLoading/Loading/AssetMarker.cpp b/src/ZoneCommon/Marking/AssetMarker.cpp
similarity index 100%
rename from src/ZoneLoading/Loading/AssetMarker.cpp
rename to src/ZoneCommon/Marking/AssetMarker.cpp
diff --git a/src/ZoneLoading/Loading/AssetMarker.h b/src/ZoneCommon/Marking/AssetMarker.h
similarity index 97%
rename from src/ZoneLoading/Loading/AssetMarker.h
rename to src/ZoneCommon/Marking/AssetMarker.h
index 3507db4b..c38073b8 100644
--- a/src/ZoneLoading/Loading/AssetMarker.h
+++ b/src/ZoneCommon/Marking/AssetMarker.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "ContentLoaderBase.h"
 #include "Pool/XAssetInfo.h"
 #include "Zone/ZoneTypes.h"