switched std::vector -> eastl::vector

19 files changed, 122 insertions, 122 deletions

diff --git a/src/zenhttp/auth/authmgr.cpp b/src/zenhttp/auth/authmgr.cpp
index 1a9892d5c..5ba64b1ee 100644
--- a/src/zenhttp/auth/authmgr.cpp
+++ b/src/zenhttp/auth/authmgr.cpp
@@ -43,7 +43,7 @@ namespace details {
 			return IoBuffer();
 		}
 
-		std::vector<uint8_t> DecryptionBuffer;
+		eastl::vector<uint8_t> DecryptionBuffer;
 		DecryptionBuffer.resize(EncryptedBuffer.GetSize() + Aes::BlockSize);
 
 		MemoryView DecryptedView = Aes::Decrypt(Key, IV, EncryptedBuffer, MakeMutableMemoryView(DecryptionBuffer), Reason);
@@ -67,7 +67,7 @@ namespace details {
 			return;
 		}
 
-		std::vector<uint8_t> EncryptionBuffer;
+		eastl::vector<uint8_t> EncryptionBuffer;
 		EncryptionBuffer.resize(FileData.GetSize() + Aes::BlockSize);
 
 		MemoryView EncryptedView = Aes::Encrypt(Key, IV, FileData, MakeMutableMemoryView(EncryptionBuffer), Reason);
@@ -421,7 +421,7 @@ private:
 			{
 				// Refresh Open ID token(s)
 
-				std::vector<OpenIdTokenMap::value_type> ExpiredTokens;
+				eastl::vector<OpenIdTokenMap::value_type> ExpiredTokens;
 
 				{
 					std::unique_lock _(m_TokenMutex);
diff --git a/src/zenhttp/auth/oidc.cpp b/src/zenhttp/auth/oidc.cpp
index 318110c7d..5bd7c2990 100644
--- a/src/zenhttp/auth/oidc.cpp
+++ b/src/zenhttp/auth/oidc.cpp
@@ -12,7 +12,7 @@ namespace zen {
 
 namespace details {
 
-	using StringArray = std::vector<std::string>;
+	using StringArray = eastl::vector<std::string>;
 
 	StringArray ToStringArray(const json11::Json JsonArray)
 	{
diff --git a/src/zenhttp/httpclient.cpp b/src/zenhttp/httpclient.cpp
index e4c6d243d..1a5955609 100644
--- a/src/zenhttp/httpclient.cpp
+++ b/src/zenhttp/httpclient.cpp
@@ -607,9 +607,9 @@ struct HttpClient::Impl : public RefCounted
 	LoggerRef Logger() { return m_Log; }
 
 private:
-	LoggerRef				   m_Log;
-	RwLock					   m_SessionLock;
-	std::vector<cpr::Session*> m_Sessions;
+	LoggerRef					 m_Log;
+	RwLock						 m_SessionLock;
+	eastl::vector<cpr::Session*> m_Sessions;
 
 	void ReleaseSession(cpr::Session*);
 };
@@ -758,7 +758,7 @@ HttpClient::TransactPackage(std::string_view Url, CbPackage Package, const KeyVa
 
 	// First, list of offered chunks for filtering on the server end
 
-	std::vector<IoHash>			  AttachmentsToSend;
+	eastl::vector<IoHash>		  AttachmentsToSend;
 	std::span<const CbAttachment> Attachments = Package.GetAttachments();
 
 	const uint32_t RequestId	   = ++HttpClientRequestIdCounter;
@@ -1150,37 +1150,37 @@ HttpClient::Download(std::string_view Url, const std::filesystem::path& TempFold
 
 			   cpr::Response Response;
 			   {
-				   std::vector<std::pair<std::string, std::string>> ReceivedHeaders;
-				   auto												HeaderCallback = [&](std::string header, intptr_t) {
-					   std::pair<std::string, std::string> Header = GetHeader(header);
-					   if (Header.first == "Content-Length"sv)
-					   {
-						   std::optional<size_t> ContentSize = ParseInt<size_t>(Header.second);
-						   if (ContentSize.has_value())
-						   {
-							   if (ContentSize.value() > 1024 * 1024)
-							   {
-								   PayloadFile = std::make_unique<detail::TempPayloadFile>();
-								   std::error_code Ec = PayloadFile->Open(TempFolderPath);
-								   if (Ec)
-								   {
-									   ZEN_WARN("Failed to create temp file in '{}' for HttpClient::Download. Reason: {}",
-												TempFolderPath.string(),
-												Ec.message());
-									   PayloadFile.reset();
-								   }
-							   }
-							   else
-							   {
-								   PayloadString.reserve(ContentSize.value());
-							   }
-						   }
-					   }
-					   if (!Header.first.empty())
-					   {
-						   ReceivedHeaders.emplace_back(std::move(Header));
-					   }
-					   return 1;
+				   eastl::vector<std::pair<std::string, std::string>> ReceivedHeaders;
+				   auto												  HeaderCallback = [&](std::string header, intptr_t) {
+					 std::pair<std::string, std::string> Header = GetHeader(header);
+					 if (Header.first == "Content-Length"sv)
+					 {
+						 std::optional<size_t> ContentSize = ParseInt<size_t>(Header.second);
+						 if (ContentSize.has_value())
+						 {
+							 if (ContentSize.value() > 1024 * 1024)
+							 {
+								 PayloadFile = std::make_unique<detail::TempPayloadFile>();
+								 std::error_code Ec = PayloadFile->Open(TempFolderPath);
+								 if (Ec)
+								 {
+									 ZEN_WARN("Failed to create temp file in '{}' for HttpClient::Download. Reason: {}",
+											  TempFolderPath.string(),
+											  Ec.message());
+									 PayloadFile.reset();
+								 }
+							 }
+							 else
+							 {
+								 PayloadString.reserve(ContentSize.value());
+							 }
+						 }
+					 }
+					 if (!Header.first.empty())
+					 {
+						 ReceivedHeaders.emplace_back(std::move(Header));
+					 }
+					 return 1;
 				   };
 
 				   Impl::Session Sess =
@@ -1221,7 +1221,7 @@ HttpClient::Download(std::string_view Url, const std::filesystem::path& TempFold
 						   std::optional<int64_t> ContentLength = ParseInt<int64_t>(It->second);
 						   if (ContentLength)
 						   {
-							   std::vector<std::pair<std::string, std::string>> ReceivedHeaders;
+							   eastl::vector<std::pair<std::string, std::string>> ReceivedHeaders;
 
 							   auto HeaderCallback = [&](std::string header, intptr_t) {
 								   std::pair<std::string, std::string> Header = GetHeader(header);
diff --git a/src/zenhttp/httpserver.cpp b/src/zenhttp/httpserver.cpp
index 27a09f339..26c1f3025 100644
--- a/src/zenhttp/httpserver.cpp
+++ b/src/zenhttp/httpserver.cpp
@@ -467,7 +467,7 @@ HttpServerRequest::~HttpServerRequest()
 void
 HttpServerRequest::WriteResponse(HttpResponseCode ResponseCode, CbPackage Data)
 {
-	std::vector<IoBuffer> ResponseBuffers = FormatPackageMessage(Data);
+	eastl::vector<IoBuffer> ResponseBuffers = FormatPackageMessage(Data);
 	return WriteResponse(ResponseCode, HttpContentType::kCbPackage, ResponseBuffers);
 }
 
@@ -922,7 +922,7 @@ HandlePackageOffers(HttpService& Service, HttpServerRequest& Request, Ref<IHttpP
 			{
 				CbObject OfferMessage = LoadCompactBinaryObject(Request.ReadPayload());
 
-				std::vector<IoHash> OfferCids;
+				eastl::vector<IoHash> OfferCids;
 
 				for (auto& CidEntry : OfferMessage["offer"])
 				{
diff --git a/src/zenhttp/include/zenhttp/auth/oidc.h b/src/zenhttp/include/zenhttp/auth/oidc.h
index 6f9c3198e..7ca6b01c0 100644
--- a/src/zenhttp/include/zenhttp/auth/oidc.h
+++ b/src/zenhttp/include/zenhttp/auth/oidc.h
@@ -5,7 +5,7 @@
 #include <zenbase/refcount.h>
 #include <zencore/string.h>
 
-#include <vector>
+#include <EASTL/vector.h>
 
 namespace zen {
 
@@ -49,7 +49,7 @@ public:
 	RefreshTokenResult RefreshToken(std::string_view RefreshToken);
 
 private:
-	using StringArray = std::vector<std::string>;
+	using StringArray = eastl::vector<std::string>;
 
 	struct OpenIdConfiguration
 	{
diff --git a/src/zenhttp/include/zenhttp/httpcommon.h b/src/zenhttp/include/zenhttp/httpcommon.h
index bc18549c9..ec7fbba88 100644
--- a/src/zenhttp/include/zenhttp/httpcommon.h
+++ b/src/zenhttp/include/zenhttp/httpcommon.h
@@ -23,7 +23,7 @@ struct HttpRange
 	uint32_t End   = ~uint32_t(0);
 };
 
-using HttpRanges = std::vector<HttpRange>;
+using HttpRanges = eastl::vector<HttpRange>;
 
 std::string_view MapContentTypeToString(HttpContentType ContentType);
 extern HttpContentType (*ParseContentType)(const std::string_view& ContentTypeString);
diff --git a/src/zenhttp/include/zenhttp/httpserver.h b/src/zenhttp/include/zenhttp/httpserver.h
index 217455dba..6cff5c69c 100644
--- a/src/zenhttp/include/zenhttp/httpserver.h
+++ b/src/zenhttp/include/zenhttp/httpserver.h
@@ -41,7 +41,7 @@ public:
 
 	struct QueryParams
 	{
-		std::vector<std::pair<std::string_view, std::string_view>> KvPairs;
+		eastl::vector<std::pair<std::string_view, std::string_view>> KvPairs;
 
 		std::string_view GetValue(std::string_view ParamName) const
 		{
@@ -137,7 +137,7 @@ protected:
 class IHttpPackageHandler : public RefCounted
 {
 public:
-	virtual void	 FilterOffer(std::vector<IoHash>& OfferCids)		   = 0;
+	virtual void	 FilterOffer(eastl::vector<IoHash>& OfferCids)		   = 0;
 	virtual void	 OnRequestBegin()									   = 0;
 	virtual IoBuffer CreateTarget(const IoHash& Cid, uint64_t StorageSize) = 0;
 	virtual void	 OnRequestComplete()								   = 0;
diff --git a/src/zenhttp/include/zenhttp/httptest.h b/src/zenhttp/include/zenhttp/httptest.h
index afe71fbce..8dfa43851 100644
--- a/src/zenhttp/include/zenhttp/httptest.h
+++ b/src/zenhttp/include/zenhttp/httptest.h
@@ -32,7 +32,7 @@ public:
 		PackageHandler(HttpTestingService& Svc, uint32_t RequestId);
 		~PackageHandler();
 
-		virtual void	 FilterOffer(std::vector<IoHash>& OfferCids) override;
+		virtual void	 FilterOffer(eastl::vector<IoHash>& OfferCids) override;
 		virtual void	 OnRequestBegin() override;
 		virtual IoBuffer CreateTarget(const IoHash& Cid, uint64_t StorageSize) override;
 		virtual void	 OnRequestComplete() override;
diff --git a/src/zenhttp/include/zenhttp/packageformat.h b/src/zenhttp/include/zenhttp/packageformat.h
index c90b840da..f5bd53c5b 100644
--- a/src/zenhttp/include/zenhttp/packageformat.h
+++ b/src/zenhttp/include/zenhttp/packageformat.h
@@ -95,19 +95,19 @@ enum class RpcAcceptOptions : uint16_t
 
 gsl_DEFINE_ENUM_BITMASK_OPERATORS(RpcAcceptOptions);
 
-std::vector<IoBuffer> FormatPackageMessage(const CbPackage& Data, FormatFlags Flags, void* TargetProcessHandle = nullptr);
-CompositeBuffer		  FormatPackageMessageBuffer(const CbPackage& Data, FormatFlags Flags, void* TargetProcessHandle = nullptr);
-CbPackage			  ParsePackageMessage(
-				IoBuffer												  Payload,
-				std::function<IoBuffer(const IoHash& Cid, uint64_t Size)> CreateBuffer = [](const IoHash&, uint64_t Size) -> IoBuffer {
-		return IoBuffer{Size};
-				});
+eastl::vector<IoBuffer> FormatPackageMessage(const CbPackage& Data, FormatFlags Flags, void* TargetProcessHandle = nullptr);
+CompositeBuffer			FormatPackageMessageBuffer(const CbPackage& Data, FormatFlags Flags, void* TargetProcessHandle = nullptr);
+CbPackage				ParsePackageMessage(
+				  IoBuffer													Payload,
+				  std::function<IoBuffer(const IoHash& Cid, uint64_t Size)> CreateBuffer = [](const IoHash&, uint64_t Size) -> IoBuffer {
+		  return IoBuffer{Size};
+				  });
 bool IsPackageMessage(IoBuffer Payload);
 
 bool ParsePackageMessageWithLegacyFallback(const IoBuffer& Response, CbPackage& OutPackage);
 
-std::vector<IoBuffer> FormatPackageMessage(const CbPackage& Data, void* TargetProcessHandle = nullptr);
-CompositeBuffer		  FormatPackageMessageBuffer(const CbPackage& Data, void* TargetProcessHandle = nullptr);
+eastl::vector<IoBuffer> FormatPackageMessage(const CbPackage& Data, void* TargetProcessHandle = nullptr);
+CompositeBuffer			FormatPackageMessageBuffer(const CbPackage& Data, void* TargetProcessHandle = nullptr);
 
 /** Streaming reader for compact binary packages
 
@@ -135,10 +135,10 @@ public:
 	 */
 	uint64_t ProcessPackageHeaderData(const void* Data, uint64_t DataBytes);
 
-	void							 Finalize();
-	const std::vector<CbAttachment>& GetAttachments() { return m_Attachments; }
-	CbObject						 GetRootObject() { return m_RootObject; }
-	std::span<IoBuffer>				 GetPayloadBuffers() { return m_PayloadBuffers; }
+	void							   Finalize();
+	const eastl::vector<CbAttachment>& GetAttachments() { return m_Attachments; }
+	CbObject						   GetRootObject() { return m_RootObject; }
+	std::span<IoBuffer>				   GetPayloadBuffers() { return m_PayloadBuffers; }
 
 private:
 	enum class State
@@ -150,9 +150,9 @@ private:
 	} m_CurrentState = State::kInitialState;
 
 	std::function<IoBuffer(const IoHash& Cid, uint64_t Size)> m_CreateBuffer;
-	std::vector<IoBuffer>									  m_PayloadBuffers;
-	std::vector<CbAttachmentEntry>							  m_AttachmentEntries;
-	std::vector<CbAttachment>								  m_Attachments;
+	eastl::vector<IoBuffer>									  m_PayloadBuffers;
+	eastl::vector<CbAttachmentEntry>						  m_AttachmentEntries;
+	eastl::vector<CbAttachment>								  m_Attachments;
 	CbObject												  m_RootObject;
 	CbPackageHeader											  m_PackageHeader;
 
diff --git a/src/zenhttp/packageformat.cpp b/src/zenhttp/packageformat.cpp
index ae80851e4..b772ba2cf 100644
--- a/src/zenhttp/packageformat.cpp
+++ b/src/zenhttp/packageformat.cpp
@@ -16,8 +16,8 @@
 #include <zencore/testutils.h>
 #include <zencore/trace.h>
 
+#include <EASTL/vector.h>
 #include <span>
-#include <vector>
 
 #include <EASTL/fixed_vector.h>
 
@@ -37,7 +37,7 @@ typedef eastl::fixed_vector<IoBuffer, 16> IoBufferVec_t;
 
 IoBufferVec_t FormatPackageMessageInternal(const CbPackage& Data, FormatFlags Flags, void* TargetProcessHandle);
 
-std::vector<IoBuffer>
+eastl::vector<IoBuffer>
 FormatPackageMessage(const CbPackage& Data, void* TargetProcessHandle)
 {
 	return FormatPackageMessage(Data, FormatFlags::kDefault, TargetProcessHandle);
@@ -48,11 +48,11 @@ FormatPackageMessageBuffer(const CbPackage& Data, void* TargetProcessHandle)
 	return FormatPackageMessageBuffer(Data, FormatFlags::kDefault, TargetProcessHandle);
 }
 
-std::vector<IoBuffer>
+eastl::vector<IoBuffer>
 FormatPackageMessage(const CbPackage& Data, FormatFlags Flags, void* TargetProcessHandle)
 {
 	auto Vec = FormatPackageMessageInternal(Data, Flags, TargetProcessHandle);
-	return std::vector<IoBuffer>(begin(Vec), end(Vec));
+	return eastl::vector<IoBuffer>(begin(Vec), end(Vec));
 }
 
 CompositeBuffer
@@ -85,7 +85,7 @@ MarshalLocal(CbAttachmentEntry*&		  AttachmentInfo,
 
 static bool
 IsLocalRef(tsl::robin_map<void*, std::string>& FileNameMap,
-		   std::vector<void*>&				   DuplicatedHandles,
+		   eastl::vector<void*>&			   DuplicatedHandles,
 		   const CompositeBuffer&			   AttachmentBinary,
 		   bool								   DenyPartialLocalReferences,
 		   void*							   TargetProcessHandle,
@@ -165,7 +165,7 @@ FormatPackageMessageInternal(const CbPackage& Data, FormatFlags Flags, void* Tar
 {
 	ZEN_TRACE_CPU("FormatPackageMessage");
 
-	std::vector<void*> DuplicatedHandles;
+	eastl::vector<void*> DuplicatedHandles;
 #if ZEN_PLATFORM_WINDOWS
 	auto _ = MakeGuard([&DuplicatedHandles, &TargetProcessHandle]() {
 		if (TargetProcessHandle == nullptr)
@@ -394,12 +394,12 @@ ParsePackageMessage(IoBuffer Payload, std::function<IoBuffer(const IoHash&, uint
 
 	CbPackage Package;
 
-	std::vector<CbAttachment> Attachments;
+	eastl::vector<CbAttachment> Attachments;
 	Attachments.reserve(ChunkCount);  // Guessing here...
 
 	tsl::robin_map<std::string, IoBuffer> PartialFileBuffers;
 
-	std::vector<std::pair<uint32_t, std::string>> MalformedAttachments;
+	eastl::vector<std::pair<uint32_t, std::string>> MalformedAttachments;
 
 	for (uint32_t i = 0; i < ChunkCount; ++i)
 	{
@@ -830,7 +830,7 @@ TEST_CASE("CbPackage.EmptyObject")
 {
 	CbPackage Pkg;
 	Pkg.SetObject({});
-	std::vector<IoBuffer> Result = FormatPackageMessage(Pkg, nullptr);
+	eastl::vector<IoBuffer> Result = FormatPackageMessage(Pkg, nullptr);
 }
 
 TEST_CASE("CbPackage.LocalRef")
diff --git a/src/zenhttp/servers/httpasio.cpp b/src/zenhttp/servers/httpasio.cpp
index fe59e3a6f..987d1ab64 100644
--- a/src/zenhttp/servers/httpasio.cpp
+++ b/src/zenhttp/servers/httpasio.cpp
@@ -12,10 +12,10 @@
 
 #include "httpparser.h"
 
+#include <EASTL/vector.h>
 #include <deque>
 #include <memory>
 #include <string_view>
-#include <vector>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #if ZEN_PLATFORM_WINDOWS
@@ -85,7 +85,7 @@ public:
 	asio::io_service						 m_IoService;
 	asio::io_service::work					 m_Work{m_IoService};
 	std::unique_ptr<asio_http::HttpAcceptor> m_Acceptor;
-	std::vector<std::thread>				 m_ThreadPool;
+	eastl::vector<std::thread>				 m_ThreadPool;
 
 	LoggerRef		 m_RequestLog;
 	HttpServerTracer m_RequestTracer;
@@ -96,8 +96,8 @@ public:
 		HttpService* Service;
 	};
 
-	RwLock					  m_Lock;
-	std::vector<ServiceEntry> m_UriHandlers;
+	RwLock						m_Lock;
+	eastl::vector<ServiceEntry> m_UriHandlers;
 };
 
 /**
@@ -195,7 +195,7 @@ public:
 	uint16_t ResponseCode() const { return m_ResponseCode; }
 	uint64_t ContentLength() const { return m_ContentLength; }
 
-	const std::vector<asio::const_buffer>& AsioBuffers() const { return m_AsioBuffers; }
+	const eastl::vector<asio::const_buffer>& AsioBuffers() const { return m_AsioBuffers; }
 
 	std::string_view GetHeaders()
 	{
@@ -218,13 +218,13 @@ public:
 	void SuppressPayload() { m_AsioBuffers.resize(1); }
 
 private:
-	uint16_t						m_ResponseCode	= 0;
-	bool							m_IsKeepAlive	= true;
-	HttpContentType					m_ContentType	= HttpContentType::kBinary;
-	uint64_t						m_ContentLength = 0;
-	std::vector<IoBuffer>			m_DataBuffers;
-	std::vector<asio::const_buffer> m_AsioBuffers;
-	ExtendableStringBuilder<160>	m_Headers;
+	uint16_t						  m_ResponseCode  = 0;
+	bool							  m_IsKeepAlive	  = true;
+	HttpContentType					  m_ContentType	  = HttpContentType::kBinary;
+	uint64_t						  m_ContentLength = 0;
+	eastl::vector<IoBuffer>			  m_DataBuffers;
+	eastl::vector<asio::const_buffer> m_AsioBuffers;
+	ExtendableStringBuilder<160>	  m_Headers;
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -494,7 +494,7 @@ HttpServerConnection::HandleRequest()
 						  ToString(Request.AcceptContentType()));
 
 			m_Server.m_RequestTracer.WriteDebugPayload(fmt::format("request_{}_{}.bin", m_ConnectionId, RequestNumber),
-													   std::vector<IoBuffer>{Request.ReadPayload()});
+													   eastl::vector<IoBuffer>{Request.ReadPayload()});
 		}
 
 		if (!HandlePackageOffers(*Service, Request, m_PackageHandler))
@@ -554,7 +554,7 @@ HttpServerConnection::HandleRequest()
 				Response->SuppressPayload();
 			}
 
-			const std::vector<asio::const_buffer>& ResponseBuffers = Response->AsioBuffers();
+			const eastl::vector<asio::const_buffer>& ResponseBuffers = Response->AsioBuffers();
 
 			uint64_t ResponseLength = 0;
 
diff --git a/src/zenhttp/servers/httpmulti.h b/src/zenhttp/servers/httpmulti.h
index 53cf57568..0494598ce 100644
--- a/src/zenhttp/servers/httpmulti.h
+++ b/src/zenhttp/servers/httpmulti.h
@@ -24,9 +24,9 @@ public:
 	void AddServer(Ref<HttpServer> Server);
 
 private:
-	bool						 m_IsInitialized = false;
-	Event						 m_ShutdownEvent;
-	std::vector<Ref<HttpServer>> m_Servers;
+	bool						   m_IsInitialized = false;
+	Event						   m_ShutdownEvent;
+	eastl::vector<Ref<HttpServer>> m_Servers;
 };
 
 }  // namespace zen
diff --git a/src/zenhttp/servers/httpparser.h b/src/zenhttp/servers/httpparser.h
index bdbcab4d9..918a5bb10 100644
--- a/src/zenhttp/servers/httpparser.h
+++ b/src/zenhttp/servers/httpparser.h
@@ -81,7 +81,7 @@ private:
 	size_t						m_CurrentHeaderNameLength  = 0;
 	char*						m_CurrentHeaderValue	   = nullptr;  // Used while parsing headers
 	size_t						m_CurrentHeaderValueLength = 0;
-	std::vector<HeaderEntry>	m_Headers;
+	eastl::vector<HeaderEntry>	m_Headers;
 	int8_t						m_ContentLengthHeaderIndex;
 	int8_t						m_AcceptHeaderIndex;
 	int8_t						m_ContentTypeHeaderIndex;
diff --git a/src/zenhttp/servers/httpplugin.cpp b/src/zenhttp/servers/httpplugin.cpp
index ec12b3755..d06e5a001 100644
--- a/src/zenhttp/servers/httpplugin.cpp
+++ b/src/zenhttp/servers/httpplugin.cpp
@@ -112,14 +112,14 @@ struct HttpPluginServerImpl : public HttpPluginServer, TransportServer
 		HttpService* Service;
 	};
 
-	bool							  m_IsInitialized = false;
-	RwLock							  m_Lock;
-	std::vector<ServiceEntry>		  m_UriHandlers;
-	std::vector<Ref<TransportPlugin>> m_Plugins;
-	Event							  m_ShutdownEvent;
-	bool							  m_IsRequestLoggingEnabled = false;
-	LoggerRef						  m_RequestLog;
-	std::atomic_uint32_t			  m_ConnectionIdCounter{0};
+	bool								m_IsInitialized = false;
+	RwLock								m_Lock;
+	eastl::vector<ServiceEntry>			m_UriHandlers;
+	eastl::vector<Ref<TransportPlugin>> m_Plugins;
+	Event								m_ShutdownEvent;
+	bool								m_IsRequestLoggingEnabled = false;
+	LoggerRef							m_RequestLog;
+	std::atomic_uint32_t				m_ConnectionIdCounter{0};
 
 	HttpServerTracer m_RequestTracer;
 
@@ -175,8 +175,8 @@ public:
 	inline uint64_t		   ContentLength() const { return m_ContentLength; }
 	inline HttpContentType ContentType() const { return m_ContentType; }
 
-	const std::vector<IoBuffer>& ResponseBuffers() const { return m_ResponseBuffers; }
-	void						 SuppressPayload() { m_ResponseBuffers.resize(1); }
+	const eastl::vector<IoBuffer>& ResponseBuffers() const { return m_ResponseBuffers; }
+	void						   SuppressPayload() { m_ResponseBuffers.resize(1); }
 
 	std::string_view GetHeaders();
 
@@ -185,7 +185,7 @@ private:
 	bool						 m_IsKeepAlive	 = true;
 	HttpContentType				 m_ContentType	 = HttpContentType::kBinary;
 	uint64_t					 m_ContentLength = 0;
-	std::vector<IoBuffer>		 m_ResponseBuffers;
+	eastl::vector<IoBuffer>		 m_ResponseBuffers;
 	ExtendableStringBuilder<160> m_Headers;
 };
 
@@ -387,7 +387,7 @@ HttpPluginConnectionHandler::HandleRequest()
 						  ToString(Request.AcceptContentType()));
 
 			m_Server->m_RequestTracer.WriteDebugPayload(fmt::format("request_{}_{}.bin", m_ConnectionId, RequestNumber),
-														std::vector<IoBuffer>{Request.ReadPayload()});
+														eastl::vector<IoBuffer>{Request.ReadPayload()});
 		}
 
 		if (!HandlePackageOffers(*Service, Request, m_PackageHandler))
@@ -450,7 +450,7 @@ HttpPluginConnectionHandler::HandleRequest()
 				Response->SuppressPayload();
 			}
 
-			const std::vector<IoBuffer>& ResponseBuffers = Response->ResponseBuffers();
+			const eastl::vector<IoBuffer>& ResponseBuffers = Response->ResponseBuffers();
 
 			if (m_Server->m_RequestLog.ShouldLog(logging::level::Trace))
 			{
diff --git a/src/zenhttp/servers/httpsys.cpp b/src/zenhttp/servers/httpsys.cpp
index 3bdcdf098..e35f27d9a 100644
--- a/src/zenhttp/servers/httpsys.cpp
+++ b/src/zenhttp/servers/httpsys.cpp
@@ -91,16 +91,16 @@ private:
 	RwLock			  m_AsyncWorkPoolInitLock;
 	WorkerThreadPool* m_AsyncWorkPool = nullptr;
 
-	std::vector<std::wstring> m_BaseUris;  // eg: http://*:nnnn/
-	HTTP_SERVER_SESSION_ID	  m_HttpSessionId	   = 0;
-	HTTP_URL_GROUP_ID		  m_HttpUrlGroupId	   = 0;
-	HANDLE					  m_RequestQueueHandle = 0;
-	std::atomic_int32_t		  m_PendingRequests{0};
-	std::atomic_int32_t		  m_IsShuttingDown{0};
-	int32_t					  m_MinPendingRequests = 16;
-	int32_t					  m_MaxPendingRequests = 128;
-	Event					  m_ShutdownEvent;
-	HttpSysConfig			  m_InitialConfig;
+	eastl::vector<std::wstring> m_BaseUris;	 // eg: http://*:nnnn/
+	HTTP_SERVER_SESSION_ID		m_HttpSessionId		 = 0;
+	HTTP_URL_GROUP_ID			m_HttpUrlGroupId	 = 0;
+	HANDLE						m_RequestQueueHandle = 0;
+	std::atomic_int32_t			m_PendingRequests{0};
+	std::atomic_int32_t			m_IsShuttingDown{0};
+	int32_t						m_MinPendingRequests = 16;
+	int32_t						m_MaxPendingRequests = 128;
+	Event						m_ShutdownEvent;
+	HttpSysConfig				m_InitialConfig;
 };
 
 }  // namespace zen
diff --git a/src/zenhttp/servers/httptracer.cpp b/src/zenhttp/servers/httptracer.cpp
index 483307fb1..6a243c36b 100644
--- a/src/zenhttp/servers/httptracer.cpp
+++ b/src/zenhttp/servers/httptracer.cpp
@@ -20,8 +20,8 @@ HttpServerTracer::Initialize(std::filesystem::path DataDir)
 void
 HttpServerTracer::WriteDebugPayload(std::string_view Filename, const std::span<const IoBuffer> Payload)
 {
-	uint64_t					 PayloadSize = 0;
-	std::vector<const IoBuffer*> Buffers;
+	uint64_t					   PayloadSize = 0;
+	eastl::vector<const IoBuffer*> Buffers;
 	for (auto& Io : Payload)
 	{
 		Buffers.push_back(&Io);
diff --git a/src/zenhttp/testing/httptest.cpp b/src/zenhttp/testing/httptest.cpp
index 090f7855e..130f6bac2 100644
--- a/src/zenhttp/testing/httptest.cpp
+++ b/src/zenhttp/testing/httptest.cpp
@@ -152,7 +152,7 @@ HttpTestingService::PackageHandler::~PackageHandler()
 }
 
 void
-HttpTestingService::PackageHandler::FilterOffer(std::vector<IoHash>& OfferCids)
+HttpTestingService::PackageHandler::FilterOffer(eastl::vector<IoHash>& OfferCids)
 {
 	ZEN_UNUSED(OfferCids);
 	// No-op
diff --git a/src/zenhttp/transports/asiotransport.cpp b/src/zenhttp/transports/asiotransport.cpp
index 96a15518c..fc7160a9f 100644
--- a/src/zenhttp/transports/asiotransport.cpp
+++ b/src/zenhttp/transports/asiotransport.cpp
@@ -50,7 +50,7 @@ private:
 	asio::io_service					   m_IoService;
 	asio::io_service::work				   m_Work{m_IoService};
 	std::unique_ptr<AsioTransportAcceptor> m_Acceptor;
-	std::vector<std::thread>			   m_ThreadPool;
+	eastl::vector<std::thread>			   m_ThreadPool;
 };
 
 struct AsioTransportConnection : public TransportConnection, std::enable_shared_from_this<AsioTransportConnection>
diff --git a/src/zenhttp/transports/dlltransport.cpp b/src/zenhttp/transports/dlltransport.cpp
index e09e62ec5..4ec5735d9 100644
--- a/src/zenhttp/transports/dlltransport.cpp
+++ b/src/zenhttp/transports/dlltransport.cpp
@@ -7,9 +7,9 @@
 #include <zencore/logging.h>
 #include <zencore/scopeguard.h>
 
+#include <EASTL/vector.h>
 #include <exception>
 #include <thread>
-#include <vector>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <fmt/format.h>
@@ -46,9 +46,9 @@ public:
 	virtual void ConfigureDll(std::string_view Name, const char* OptionTag, const char* OptionValue) override;
 
 private:
-	TransportServer*	   m_ServerInterface = nullptr;
-	RwLock				   m_Lock;
-	std::vector<LoadedDll> m_Transports;
+	TransportServer*		 m_ServerInterface = nullptr;
+	RwLock					 m_Lock;
+	eastl::vector<LoadedDll> m_Transports;
 };
 
 DllTransportPluginImpl::DllTransportPluginImpl()