From ca09abbeef5b1788f4a52b61eedd2f3dd07f81f2 Mon Sep 17 00:00:00 2001
From: Stefan Boberg <stefan.boberg@epicgames.com>
Date: Tue, 14 Oct 2025 11:32:16 +0200
Subject: move all storage-related services into storage tree (#571)

* move all storage-related services into storage tree
* move config into config/
* also move admin service into storage since it mostly has storage related functionality
* header consolidation
---
 src/zenserver/main.cpp | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/zenserver/main.cpp')

diff --git a/src/zenserver/main.cpp b/src/zenserver/main.cpp
index 97847b65d..3119b37c6 100644
--- a/src/zenserver/main.cpp
+++ b/src/zenserver/main.cpp
@@ -1,7 +1,5 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
-#include "zenstorageserver.h"
-
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/compactbinaryvalidation.h>
 #include <zencore/config.h>
@@ -9,23 +7,22 @@
 #include <zencore/filesystem.h>
 #include <zencore/fmtutils.h>
 #include <zencore/logging.h>
+#include <zencore/memory/fmalloc.h>
+#include <zencore/memory/llm.h>
+#include <zencore/memory/memory.h>
+#include <zencore/memory/memorytrace.h>
+#include <zencore/memory/newdelete.h>
 #include <zencore/scopeguard.h>
 #include <zencore/sentryintegration.h>
 #include <zencore/session.h>
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/trace.h>
-
-#include <zencore/memory/fmalloc.h>
-#include <zencore/memory/llm.h>
-#include <zencore/memory/memory.h>
-#include <zencore/memory/memorytrace.h>
-#include <zencore/memory/newdelete.h>
-
 #include <zenutil/service.h>
 
 #include "diag/logging.h"
-#include "storageconfig.h"
+#include "storage/storageconfig.h"
+#include "storage/zenstorageserver.h"
 
 #if ZEN_PLATFORM_WINDOWS
 #	include <zencore/windows.h>
@@ -39,11 +36,8 @@
 #if ZEN_WITH_TESTS
 #	define ZEN_TEST_WITH_RUNNER 1
 #	include <zencore/testing.h>
-#	include <zenutil/zenutil.h>
 #endif
 
-#include <memory>
-
 namespace zen::utils {
 std::atomic_uint32_t SignalCounter[NSIG] = {0};
 
-- 
cgit v1.2.3