diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index f471f58b5..b65ab7311 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -93,6 +93,8 @@ set(common_sources
     spdat.cpp
     spdat_bot.cpp
     strings.cpp
+    strings_legacy.cpp
+    strings_misc.cpp
     struct_strategy.cpp
     textures.cpp
     timer.cpp
diff --git a/common/strings.cpp b/common/strings.cpp
index cdb754cad..62aec2975 100644
--- a/common/strings.cpp
+++ b/common/strings.cpp
@@ -48,14 +48,9 @@
 #include <random>
 #include <string>
 
-//Const char based
-#include "strings_legacy.cpp" // legacy c functions
-#include "strings_misc.cpp" // anything non "Strings" scoped
-
 #ifdef _WINDOWS
 #include <ctype.h>
 #include <functional>
-#include <algorithm>
 #endif
 
 std::string Strings::Random(size_t length)
diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 86037d73b..66a789cc2 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -111,6 +111,7 @@ set(zone_sources
     xtargetautohaters.cpp
     zone.cpp
     zone_config.cpp
+    zone_loot.cpp
     zonedb.cpp
     zone_base_data.cpp
     zone_event_scheduler.cpp
diff --git a/zone/zone.cpp b/zone/zone.cpp
index 4e4108720..771ac9538 100644
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -3584,5 +3584,3 @@ std::vector<std::string> Zone::GetTimers()
 
 	return v;
 }
-
-#include "zone_loot.cpp"