Removed StringHelper in favor of the LUS one (#38)

76 files changed, 74 insertions, 298 deletions

diff --git a/ZAPD/CrashHandler.cpp b/ZAPD/CrashHandler.cpp
index 6c05733..17aa9d5 100644
--- a/ZAPD/CrashHandler.cpp
+++ b/ZAPD/CrashHandler.cpp
@@ -1,5 +1,5 @@
 #include "CrashHandler.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 #if __has_include(<unistd.h>)
 #define HAS_POSIX 1
diff --git a/ZAPD/Declaration.cpp b/ZAPD/Declaration.cpp
index e4f91d8..35863b3 100644
--- a/ZAPD/Declaration.cpp
+++ b/ZAPD/Declaration.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "ZVtx.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 Declaration::Declaration(offset_t nAddress, DeclarationAlignment nAlignment, size_t nSize,
                          const std::string& nBody)
diff --git a/ZAPD/ImageBackend.cpp b/ZAPD/ImageBackend.cpp
index 7c75947..a24e273 100644
--- a/ZAPD/ImageBackend.cpp
+++ b/ZAPD/ImageBackend.cpp
@@ -6,7 +6,7 @@
 #include <png.h>
 #include <stdexcept>
 
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 
 /* ImageBackend */
diff --git a/ZAPD/OtherStructs/CutsceneMM_Commands.cpp b/ZAPD/OtherStructs/CutsceneMM_Commands.cpp
index 401e7d6..79e456a 100644
--- a/ZAPD/OtherStructs/CutsceneMM_Commands.cpp
+++ b/ZAPD/OtherStructs/CutsceneMM_Commands.cpp
@@ -3,7 +3,7 @@
 #include <unordered_map>
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 
 /**** GENERIC ****/
diff --git a/ZAPD/OtherStructs/CutsceneOoT_Commands.cpp b/ZAPD/OtherStructs/CutsceneOoT_Commands.cpp
index f057739..40c969d 100644
--- a/ZAPD/OtherStructs/CutsceneOoT_Commands.cpp
+++ b/ZAPD/OtherStructs/CutsceneOoT_Commands.cpp
@@ -4,7 +4,7 @@
 #include <unordered_map>
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 /**** GENERIC ****/
 
diff --git a/ZAPD/OtherStructs/Cutscene_Common.cpp b/ZAPD/OtherStructs/Cutscene_Common.cpp
index a5ea609..3e569cb 100644
--- a/ZAPD/OtherStructs/Cutscene_Common.cpp
+++ b/ZAPD/OtherStructs/Cutscene_Common.cpp
@@ -1,6 +1,6 @@
 #include "Cutscene_Common.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 /* CutsceneSubCommandEntry */
 
diff --git a/ZAPD/OtherStructs/SkinLimbStructs.cpp b/ZAPD/OtherStructs/SkinLimbStructs.cpp
index 430cc66..2fff0ca 100644
--- a/ZAPD/OtherStructs/SkinLimbStructs.cpp
+++ b/ZAPD/OtherStructs/SkinLimbStructs.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZDisplayList.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/Overlays/ZOverlay.cpp b/ZAPD/Overlays/ZOverlay.cpp
index 168ed23..df4ca1e 100644
--- a/ZAPD/Overlays/ZOverlay.cpp
+++ b/ZAPD/Overlays/ZOverlay.cpp
@@ -7,7 +7,7 @@
 #include "Utils/Directory.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 
 using namespace ELFIO;
diff --git a/ZAPD/Utils/Directory.h b/ZAPD/Utils/Directory.h
index ea792d8..8455e52 100644
--- a/ZAPD/Utils/Directory.h
+++ b/ZAPD/Utils/Directory.h
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <vector>
-#include "StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include <iostream>
 
 #if __has_include(<filesystem>)
diff --git a/ZAPD/Utils/DiskFile.h b/ZAPD/Utils/DiskFile.h
index d3ec03c..c533d95 100644
--- a/ZAPD/Utils/DiskFile.h
+++ b/ZAPD/Utils/DiskFile.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 #include "Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "Utils/Directory.h"
 
 
diff --git a/ZAPD/Utils/Path.h b/ZAPD/Utils/Path.h
index 0f7ef27..faaa3f3 100644
--- a/ZAPD/Utils/Path.h
+++ b/ZAPD/Utils/Path.h
@@ -2,7 +2,7 @@
 
 #include <iostream>
 #include <string>
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 #if __has_include(<filesystem>)
 #include <filesystem>
diff --git a/ZAPD/Utils/StringHelper.cpp b/ZAPD/Utils/StringHelper.cpp
deleted file mode 100644
index c55580e..0000000
--- a/ZAPD/Utils/StringHelper.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "StringHelper.h"
-
-#if (_MSC_VER)
-#pragma optimize("2", on)
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#ifndef _MSC_VER
-#define vsprintf_s vsprintf
-#endif
-
-std::vector<std::string> StringHelper::Split(std::string s, const std::string& delimiter)
-{
-    size_t pos_start = 0, pos_end, delim_len = delimiter.length();
-    std::string token;
-    std::vector<std::string> res;
-
-    while ((pos_end = s.find(delimiter, pos_start)) != std::string::npos) {
-        token = s.substr(pos_start, pos_end - pos_start);
-        pos_start = pos_end + delim_len;
-        res.push_back(token);
-    }
-
-    res.push_back(s.substr(pos_start));
-    return res;
-}
-
-std::vector<std::string_view> StringHelper::Split(std::string_view s, const std::string& delimiter)
-{
-    size_t pos_start = 0, pos_end, delim_len = delimiter.length();
-    std::string_view token;
-    std::vector<std::string_view> res;
-
-    while ((pos_end = s.find(delimiter, pos_start)) != std::string_view::npos)
-    {
-        token = s.substr(pos_start, pos_end - pos_start);
-        pos_start = pos_end + delim_len;
-        res.push_back(token);
-    }
-
-    res.push_back(s.substr(pos_start));
-    return res;
-}
-
-std::string StringHelper::Strip(std::string s, const std::string& delimiter)
-{
-	size_t pos = 0;
-	std::string token;
-
-	while ((pos = s.find(delimiter)) != std::string::npos)
-	{
-		token = s.substr(0, pos);
-		s.erase(pos, pos + delimiter.length());
-	}
-
-	return s;
-}
-
-std::string StringHelper::Replace(std::string str, const std::string& from,
-                                            const std::string& to)
-{
-	size_t start_pos = str.find(from);
-
-	while (start_pos != std::string::npos)
-	{
-		str.replace(start_pos, from.length(), to);
-		start_pos = str.find(from);
-	}
-
-	return str;
-}
-
-void StringHelper::ReplaceOriginal(std::string& str, const std::string& from, const std::string& to)
-{
-	size_t start_pos = str.find(from);
-
-	while (start_pos != std::string::npos)
-	{
-		str.replace(start_pos, from.length(), to);
-		start_pos = str.find(from);
-	}
-}
-
-bool StringHelper::StartsWith(const std::string& s, const std::string& input)
-{
-#if __cplusplus >= 202002L
-	return s.starts_with(input.c_str());
-#else
-	return s.rfind(input, 0) == 0;
-#endif
-}
-
-bool StringHelper::Contains(const std::string& s, const std::string& input)
-{
-	return s.find(input) != std::string::npos;
-}
-
-bool StringHelper::EndsWith(const std::string& s, const std::string& input)
-{
-	size_t inputLen = strlen(input.c_str());
-	return s.rfind(input) == (s.size() - inputLen);
-}
-
-std::string StringHelper::Sprintf(const char* format, ...)
-{
-	char buffer[32768];
-	// char buffer[2048];
-	std::string output;
-	va_list va;
-
-	va_start(va, format);
-	vsprintf_s(buffer, format, va);
-	va_end(va);
-
-	output = buffer;
-	return output;
-}
-
-std::string StringHelper::Implode(std::vector<std::string>& elements,
-                                            const char* const separator)
-{
-	return "";
-
-	// return std::accumulate(std::begin(elements), std::end(elements), std::string(),
-	//[separator](std::string& ss, std::string& s) {
-	// return ss.empty() ? s : ss + separator + s;
-	//});
-}
-
-int64_t StringHelper::StrToL(const std::string& str, int32_t base)
-{
-	return std::strtoull(str.c_str(), nullptr, base);
-}
-
-std::string StringHelper::BoolStr(bool b)
-{
-	return b ? "true" : "false";
-}
-
-bool StringHelper::HasOnlyDigits(const std::string& str)
-{
-	return std::all_of(str.begin(), str.end(), ::isdigit);
-}
-
-// Validate a hex string based on the c89 standard
-// https://www.gnu.org/software/gnu-c-manual/gnu-c-manual.html#Integer-Constants
-bool StringHelper::IsValidHex(std::string_view str)
-{
-	if (str.length() < 3)
-	{
-		return false;
-	}
-	if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X'))
-	{
-		return std::all_of(str.begin() + 2, str.end(), ::isxdigit);
-	}
-	return false;
-}
-
-
-bool StringHelper::IsValidHex(const std::string& str)
-{
-	return IsValidHex(std::string_view(str.c_str()));
-}
-
-bool StringHelper::IsValidOffset(std::string_view str)
-{
-	if (str.length() == 1)
-	{
-		// 0 is a valid offset
-		return isdigit(str[0]);
-	}
-	return IsValidHex(str);
-}
-
-bool StringHelper::IsValidOffset(const std::string& str)
-{
-	if (str.length() == 1)
-	{
-		// 0 is a valid offset
-		return isdigit(str[0]);
-	}
-	return IsValidHex(str);
-}
-
-
-bool StringHelper::IEquals(const std::string& a, const std::string& b)
-{
-	return std::equal(a.begin(), a.end(), b.begin(), b.end(),
-	                    [](char a, char b) { return tolower(a) == tolower(b); });
-}
diff --git a/ZAPD/Utils/StringHelper.h b/ZAPD/Utils/StringHelper.h
deleted file mode 100644
index 0fc58d3..0000000
--- a/ZAPD/Utils/StringHelper.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <cstdarg>
-#include <cstring>
-#include <numeric>
-#include <string>
-#include <string_view>
-#include <vector>
-#include <cstdint>
-
-class StringHelper
-{
-public:
-	static std::vector<std::string> Split(std::string s, const std::string& delimiter);
-	static std::vector<std::string_view> Split(std::string_view s, const std::string& delimiter);
-	static std::string Strip(std::string s, const std::string& delimiter);
-	static std::string Replace(std::string str, const std::string& from, const std::string& to);
-	static void ReplaceOriginal(std::string& str, const std::string& from, const std::string& to);
-	static bool StartsWith(const std::string& s, const std::string& input);
-	static bool Contains(const std::string& s, const std::string& input);
-	static bool EndsWith(const std::string& s, const std::string& input);
-	static std::string Sprintf(const char* format, ...);
-	static std::string Implode(std::vector<std::string>& elements, const char* const separator);
-	static int64_t StrToL(const std::string& str, int32_t base = 10);
-	static std::string BoolStr(bool b);
-	static bool HasOnlyDigits(const std::string& str);
-	static bool IsValidHex(std::string_view str);
-	static bool IsValidHex(const std::string& str); 
-	static bool IsValidOffset(std::string_view str);
-	static bool IsValidOffset(const std::string& str);
-	static bool IEquals(const std::string& a, const std::string& b);
-};
\ No newline at end of file
diff --git a/ZAPD/WarningHandler.cpp b/ZAPD/WarningHandler.cpp
index f416a5b..edb078a 100644
--- a/ZAPD/WarningHandler.cpp
+++ b/ZAPD/WarningHandler.cpp
@@ -59,7 +59,7 @@
 
 #include <cassert>
 #include "Globals.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 typedef struct
 {
diff --git a/ZAPD/ZAnimation.cpp b/ZAPD/ZAnimation.cpp
index c00fa4b..2e3b15d 100644
--- a/ZAPD/ZAnimation.cpp
+++ b/ZAPD/ZAnimation.cpp
@@ -5,7 +5,7 @@
 #include "Globals.h"
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZArray.cpp b/ZAPD/ZArray.cpp
index 417f154..1feb409 100644
--- a/ZAPD/ZArray.cpp
+++ b/ZAPD/ZArray.cpp
@@ -3,7 +3,7 @@
 #include <cassert>
 
 #include "Globals.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZAudio.cpp b/ZAPD/ZAudio.cpp
index 03c1efa..0643af8 100644
--- a/ZAPD/ZAudio.cpp
+++ b/ZAPD/ZAudio.cpp
@@ -4,7 +4,7 @@
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 REGISTER_ZFILENODE(Audio, ZAudio);
diff --git a/ZAPD/ZBackground.cpp b/ZAPD/ZBackground.cpp
index 920945b..e1c1251 100644
--- a/ZAPD/ZBackground.cpp
+++ b/ZAPD/ZBackground.cpp
@@ -4,7 +4,7 @@
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZBlob.cpp b/ZAPD/ZBlob.cpp
index 0965d7e..7b253b9 100644
--- a/ZAPD/ZBlob.cpp
+++ b/ZAPD/ZBlob.cpp
@@ -4,7 +4,7 @@
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 REGISTER_ZFILENODE(Blob, ZBlob);
diff --git a/ZAPD/ZCKeyFrame.cpp b/ZAPD/ZCKeyFrame.cpp
index 044eafd..fd43f06 100644
--- a/ZAPD/ZCKeyFrame.cpp
+++ b/ZAPD/ZCKeyFrame.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 
 REGISTER_ZFILENODE(KeyFrameSkel, ZKeyFrameSkel);
diff --git a/ZAPD/ZCollision.cpp b/ZAPD/ZCollision.cpp
index 7a724e5..0fa8aa7 100644
--- a/ZAPD/ZCollision.cpp
+++ b/ZAPD/ZCollision.cpp
@@ -7,7 +7,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 REGISTER_ZFILENODE(Collision, ZCollisionHeader);
 
diff --git a/ZAPD/ZCollisionPoly.cpp b/ZAPD/ZCollisionPoly.cpp
index c4eb2d4..6977cf5 100644
--- a/ZAPD/ZCollisionPoly.cpp
+++ b/ZAPD/ZCollisionPoly.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 REGISTER_ZFILENODE(CollisionPoly, ZCollisionPoly);
 
diff --git a/ZAPD/ZCutscene.cpp b/ZAPD/ZCutscene.cpp
index 75fb60c..61cd551 100644
--- a/ZAPD/ZCutscene.cpp
+++ b/ZAPD/ZCutscene.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZResource.h"
 
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp
index 03a1f01..66db254 100644
--- a/ZAPD/ZDisplayList.cpp
+++ b/ZAPD/ZDisplayList.cpp
@@ -12,7 +12,7 @@
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "gfxd.h"
 
diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp
index 25bf5a0..724d406 100644
--- a/ZAPD/ZFile.cpp
+++ b/ZAPD/ZFile.cpp
@@ -13,7 +13,7 @@
 #include <Utils/DiskFile.h>
 #include "Utils/MemoryStream.h"
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZAnimation.h"
 #include "ZArray.h"
diff --git a/ZAPD/ZLimb.cpp b/ZAPD/ZLimb.cpp
index 736f2de..4d8b327 100644
--- a/ZAPD/ZLimb.cpp
+++ b/ZAPD/ZLimb.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZSkeleton.h"
 
diff --git a/ZAPD/ZMtx.cpp b/ZAPD/ZMtx.cpp
index ffca3eb..03fefec 100644
--- a/ZAPD/ZMtx.cpp
+++ b/ZAPD/ZMtx.cpp
@@ -1,7 +1,7 @@
 #include "ZMtx.h"
 
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 REGISTER_ZFILENODE(Mtx, ZMtx);
diff --git a/ZAPD/ZPath.cpp b/ZAPD/ZPath.cpp
index 8ea6d29..2f239d6 100644
--- a/ZAPD/ZPath.cpp
+++ b/ZAPD/ZPath.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZPlayerAnimationData.cpp b/ZAPD/ZPlayerAnimationData.cpp
index d3bcb10..ca98970 100644
--- a/ZAPD/ZPlayerAnimationData.cpp
+++ b/ZAPD/ZPlayerAnimationData.cpp
@@ -1,7 +1,7 @@
 #include "ZPlayerAnimationData.h"
 
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include <Globals.h>
 
diff --git a/ZAPD/ZPointer.cpp b/ZAPD/ZPointer.cpp
index 61ad9ac..9440147 100644
--- a/ZAPD/ZPointer.cpp
+++ b/ZAPD/ZPointer.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZResource.cpp b/ZAPD/ZResource.cpp
index 768a066..28d8271 100644
--- a/ZAPD/ZResource.cpp
+++ b/ZAPD/ZResource.cpp
@@ -3,7 +3,7 @@
 #include <cassert>
 #include <regex>
 
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 #include <Globals.h>
diff --git a/ZAPD/ZRoom/Commands/SetActorList.cpp b/ZAPD/ZRoom/Commands/SetActorList.cpp
index 0e667c0..33a09c0 100644
--- a/ZAPD/ZRoom/Commands/SetActorList.cpp
+++ b/ZAPD/ZRoom/Commands/SetActorList.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZRoom/ZRoom.h"
 
 SetActorList::SetActorList(ZFile* nParent) : ZRoomCommand(nParent)
diff --git a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
index 7418f29..68a58e6 100644
--- a/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
+++ b/ZAPD/ZRoom/Commands/SetAlternateHeaders.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 SetAlternateHeaders::SetAlternateHeaders(ZFile* nParent) : ZRoomCommand(nParent)
diff --git a/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp b/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
index 73f7213..53bd90b 100644
--- a/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
+++ b/ZAPD/ZRoom/Commands/SetAnimatedMaterialList.cpp
@@ -7,7 +7,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 #include "ZTextureAnimation.h"
diff --git a/ZAPD/ZRoom/Commands/SetCameraSettings.cpp b/ZAPD/ZRoom/Commands/SetCameraSettings.cpp
index e30e1b6..a0dbf76 100644
--- a/ZAPD/ZRoom/Commands/SetCameraSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetCameraSettings.cpp
@@ -1,7 +1,7 @@
 #include "SetCameraSettings.h"
 
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "Globals.h"
 
 SetCameraSettings::SetCameraSettings(ZFile* nParent) : ZRoomCommand(nParent)
diff --git a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
index 4aafb7c..5c086fb 100644
--- a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
+++ b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetCsCamera.cpp b/ZAPD/ZRoom/Commands/SetCsCamera.cpp
index 7e36f3e..032dac3 100644
--- a/ZAPD/ZRoom/Commands/SetCsCamera.cpp
+++ b/ZAPD/ZRoom/Commands/SetCsCamera.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp b/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp
index ac64a64..a5feb28 100644
--- a/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp
+++ b/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/ZAPD/ZRoom/Commands/SetCutscenes.cpp
index e9192f0..f0b5176 100644
--- a/ZAPD/ZRoom/Commands/SetCutscenes.cpp
+++ b/ZAPD/ZRoom/Commands/SetCutscenes.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetEchoSettings.cpp b/ZAPD/ZRoom/Commands/SetEchoSettings.cpp
index 79a278b..463833f 100644
--- a/ZAPD/ZRoom/Commands/SetEchoSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetEchoSettings.cpp
@@ -1,5 +1,5 @@
 #include "SetEchoSettings.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetEchoSettings::SetEchoSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetEntranceList.cpp b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
index c5d57df..7dd4a45 100644
--- a/ZAPD/ZRoom/Commands/SetEntranceList.cpp
+++ b/ZAPD/ZRoom/Commands/SetEntranceList.cpp
@@ -3,7 +3,7 @@
 #include "Globals.h"
 #include "SetStartPositionList.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetExitList.cpp b/ZAPD/ZRoom/Commands/SetExitList.cpp
index 3068d5c..376d1b0 100644
--- a/ZAPD/ZRoom/Commands/SetExitList.cpp
+++ b/ZAPD/ZRoom/Commands/SetExitList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetLightList.cpp b/ZAPD/ZRoom/Commands/SetLightList.cpp
index 4c551be..dcd5e6d 100644
--- a/ZAPD/ZRoom/Commands/SetLightList.cpp
+++ b/ZAPD/ZRoom/Commands/SetLightList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetLightList::SetLightList(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
index 796e267..91c9630 100644
--- a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetMesh.cpp b/ZAPD/ZRoom/Commands/SetMesh.cpp
index 2a39766..82d69f1 100644
--- a/ZAPD/ZRoom/Commands/SetMesh.cpp
+++ b/ZAPD/ZRoom/Commands/SetMesh.cpp
@@ -3,7 +3,7 @@
 #include "Globals.h"
 #include "Utils/BitConverter.h"
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZBackground.h"
 #include "ZFile.h"
diff --git a/ZAPD/ZRoom/Commands/SetMinimapChests.cpp b/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
index 25bfae7..4c794c2 100644
--- a/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
+++ b/ZAPD/ZRoom/Commands/SetMinimapChests.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetMinimapList.cpp b/ZAPD/ZRoom/Commands/SetMinimapList.cpp
index 68f2771..7de1726 100644
--- a/ZAPD/ZRoom/Commands/SetMinimapList.cpp
+++ b/ZAPD/ZRoom/Commands/SetMinimapList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetObjectList.cpp b/ZAPD/ZRoom/Commands/SetObjectList.cpp
index a8bb76a..66618f3 100644
--- a/ZAPD/ZRoom/Commands/SetObjectList.cpp
+++ b/ZAPD/ZRoom/Commands/SetObjectList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetPathways.cpp b/ZAPD/ZRoom/Commands/SetPathways.cpp
index 429a369..beef06d 100644
--- a/ZAPD/ZRoom/Commands/SetPathways.cpp
+++ b/ZAPD/ZRoom/Commands/SetPathways.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp b/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp
index 8c6f4bf..49136a4 100644
--- a/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp
+++ b/ZAPD/ZRoom/Commands/SetRoomBehavior.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetRoomBehavior::SetRoomBehavior(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetRoomList.cpp b/ZAPD/ZRoom/Commands/SetRoomList.cpp
index abb2b00..f0b33ed 100644
--- a/ZAPD/ZRoom/Commands/SetRoomList.cpp
+++ b/ZAPD/ZRoom/Commands/SetRoomList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZRoom.h"
 
diff --git a/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp b/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp
index b16f135..689f965 100644
--- a/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp
+++ b/ZAPD/ZRoom/Commands/SetSkyboxModifier.cpp
@@ -1,6 +1,6 @@
 #include "SetSkyboxModifier.h"
 
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetSkyboxModifier::SetSkyboxModifier(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp b/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp
index d5ae7ef..b4ce3af 100644
--- a/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetSkyboxSettings.cpp
@@ -1,6 +1,6 @@
 #include "SetSkyboxSettings.h"
 #include "Globals.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetSkyboxSettings::SetSkyboxSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetSoundSettings.cpp b/ZAPD/ZRoom/Commands/SetSoundSettings.cpp
index 54b9132..a8a17bb 100644
--- a/ZAPD/ZRoom/Commands/SetSoundSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetSoundSettings.cpp
@@ -1,5 +1,5 @@
 #include "SetSoundSettings.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetSoundSettings::SetSoundSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp b/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp
index 34edf5a..e7a6f17 100644
--- a/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp
+++ b/ZAPD/ZRoom/Commands/SetSpecialObjects.cpp
@@ -1,7 +1,7 @@
 #include "SetSpecialObjects.h"
 
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZRoom/ZNames.h"
 
 SetSpecialObjects::SetSpecialObjects(ZFile* nParent) : ZRoomCommand(nParent)
diff --git a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
index 03856d2..ad9449b 100644
--- a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
+++ b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetTimeSettings.cpp b/ZAPD/ZRoom/Commands/SetTimeSettings.cpp
index 9d4d356..4bb66f9 100644
--- a/ZAPD/ZRoom/Commands/SetTimeSettings.cpp
+++ b/ZAPD/ZRoom/Commands/SetTimeSettings.cpp
@@ -1,6 +1,6 @@
 #include "SetTimeSettings.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetTimeSettings::SetTimeSettings(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
index 051ddd8..a0f19bb 100644
--- a/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
+++ b/ZAPD/ZRoom/Commands/SetTransitionActorList.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 #include "ZRoom/ZNames.h"
 #include "ZRoom/ZRoom.h"
diff --git a/ZAPD/ZRoom/Commands/SetWind.cpp b/ZAPD/ZRoom/Commands/SetWind.cpp
index 1893b56..69561e2 100644
--- a/ZAPD/ZRoom/Commands/SetWind.cpp
+++ b/ZAPD/ZRoom/Commands/SetWind.cpp
@@ -1,5 +1,5 @@
 #include "SetWind.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 SetWind::SetWind(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp b/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp
index fa28547..e8360ed 100644
--- a/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp
+++ b/ZAPD/ZRoom/Commands/SetWorldMapVisited.cpp
@@ -1,6 +1,6 @@
 #include "SetWorldMapVisited.h"
 
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "Globals.h"
 
 SetWorldMapVisited::SetWorldMapVisited(ZFile* nParent) : ZRoomCommand(nParent)
diff --git a/ZAPD/ZRoom/Commands/Unused09.cpp b/ZAPD/ZRoom/Commands/Unused09.cpp
index 9dfcaa5..e4b7b3a 100644
--- a/ZAPD/ZRoom/Commands/Unused09.cpp
+++ b/ZAPD/ZRoom/Commands/Unused09.cpp
@@ -1,5 +1,5 @@
 #include "Unused09.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 Unused09::Unused09(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/Unused1D.cpp b/ZAPD/ZRoom/Commands/Unused1D.cpp
index b8ea136..603c2d9 100644
--- a/ZAPD/ZRoom/Commands/Unused1D.cpp
+++ b/ZAPD/ZRoom/Commands/Unused1D.cpp
@@ -1,5 +1,5 @@
 #include "Unused1D.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 Unused1D::Unused1D(ZFile* nParent) : ZRoomCommand(nParent)
 {
diff --git a/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp b/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp
index a892086..fb4f0b6 100644
--- a/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp
+++ b/ZAPD/ZRoom/Commands/ZRoomCommandUnk.cpp
@@ -1,6 +1,6 @@
 #include "ZRoomCommandUnk.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZRoom/ZRoom.h"
 
 ZRoomCommandUnk::ZRoomCommandUnk(ZFile* nParent) : ZRoomCommand(nParent)
diff --git a/ZAPD/ZRoom/ZNames.h b/ZAPD/ZRoom/ZNames.h
index 83c217e..64505e3 100644
--- a/ZAPD/ZRoom/ZNames.h
+++ b/ZAPD/ZRoom/ZNames.h
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "Globals.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 class ZNames
 {
diff --git a/ZAPD/ZRoom/ZRoom.cpp b/ZAPD/ZRoom/ZRoom.cpp
index 9b5f310..572b9cc 100644
--- a/ZAPD/ZRoom/ZRoom.cpp
+++ b/ZAPD/ZRoom/ZRoom.cpp
@@ -41,7 +41,7 @@
 #include "Globals.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZBlob.h"
 #include "ZCutscene.h"
diff --git a/ZAPD/ZRoom/ZRoomCommand.cpp b/ZAPD/ZRoom/ZRoomCommand.cpp
index 711c86a..8d76a6b 100644
--- a/ZAPD/ZRoom/ZRoomCommand.cpp
+++ b/ZAPD/ZRoom/ZRoomCommand.cpp
@@ -1,7 +1,7 @@
 #include "ZRoomCommand.h"
 
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZRoom.h"
 
 ZRoomCommand::ZRoomCommand(ZFile* nParent) : ZResource(nParent)
diff --git a/ZAPD/ZScalar.cpp b/ZAPD/ZScalar.cpp
index 6c4cf12..466fd20 100644
--- a/ZAPD/ZScalar.cpp
+++ b/ZAPD/ZScalar.cpp
@@ -3,7 +3,7 @@
 #include "Globals.h"
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZSkeleton.cpp b/ZAPD/ZSkeleton.cpp
index 8fa4945..0983d34 100644
--- a/ZAPD/ZSkeleton.cpp
+++ b/ZAPD/ZSkeleton.cpp
@@ -4,7 +4,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 
 REGISTER_ZFILENODE(Skeleton, ZSkeleton);
diff --git a/ZAPD/ZString.cpp b/ZAPD/ZString.cpp
index 4a90694..e87414b 100644
--- a/ZAPD/ZString.cpp
+++ b/ZAPD/ZString.cpp
@@ -1,7 +1,7 @@
 #include "ZString.h"
 
 #include <Utils/DiskFile.h>
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 REGISTER_ZFILENODE(String, ZString);
diff --git a/ZAPD/ZSurfaceType.cpp b/ZAPD/ZSurfaceType.cpp
index 27e73ac..02ff094 100644
--- a/ZAPD/ZSurfaceType.cpp
+++ b/ZAPD/ZSurfaceType.cpp
@@ -2,7 +2,7 @@
 

 #include "Globals.h"

 #include "Utils/BitConverter.h"

-#include "Utils/StringHelper.h"

+#include <ship/utils/StringHelper.h>

 

 REGISTER_ZFILENODE(SurfaceType, ZSurfaceType);

 

diff --git a/ZAPD/ZSymbol.cpp b/ZAPD/ZSymbol.cpp
index b5df686..603d4d8 100644
--- a/ZAPD/ZSymbol.cpp
+++ b/ZAPD/ZSymbol.cpp
@@ -1,6 +1,6 @@
 #include "ZSymbol.h"
 
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZText.cpp b/ZAPD/ZText.cpp
index 16704a4..56a4c73 100644
--- a/ZAPD/ZText.cpp
+++ b/ZAPD/ZText.cpp
@@ -4,7 +4,7 @@
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 REGISTER_ZFILENODE(Text, ZText);
diff --git a/ZAPD/ZTextMM.cpp b/ZAPD/ZTextMM.cpp
index 7c57941..0fd4637 100644
--- a/ZAPD/ZTextMM.cpp
+++ b/ZAPD/ZTextMM.cpp
@@ -4,7 +4,7 @@
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
 #include "Utils/Path.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 REGISTER_ZFILENODE(TextMM, ZTextMM);
diff --git a/ZAPD/ZVector.cpp b/ZAPD/ZVector.cpp
index 092b876..b05ac46 100644
--- a/ZAPD/ZVector.cpp
+++ b/ZAPD/ZVector.cpp
@@ -5,7 +5,7 @@
 #include "Globals.h"
 #include "Utils/BitConverter.h"
 #include <Utils/DiskFile.h>
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "WarningHandler.h"
 #include "ZFile.h"
 
diff --git a/ZAPD/ZVtx.cpp b/ZAPD/ZVtx.cpp
index e4b3d97..f776042 100644
--- a/ZAPD/ZVtx.cpp
+++ b/ZAPD/ZVtx.cpp
@@ -1,7 +1,7 @@
 #include "ZVtx.h"
 
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 #include "ZFile.h"
 
 REGISTER_ZFILENODE(Vtx, ZVtx);
diff --git a/ZAPD/ZWaterbox.cpp b/ZAPD/ZWaterbox.cpp
index 9a289db..39aae5a 100644
--- a/ZAPD/ZWaterbox.cpp
+++ b/ZAPD/ZWaterbox.cpp
@@ -2,7 +2,7 @@
 
 #include "Globals.h"
 #include "Utils/BitConverter.h"
-#include "Utils/StringHelper.h"
+#include <ship/utils/StringHelper.h>
 
 REGISTER_ZFILENODE(Waterbox, ZWaterbox);