7 files changed, 22 insertions, 12 deletions
diff --git a/src/zenstore/cache/cacherpc.cpp b/src/zenstore/cache/cacherpc.cpp
index 0a1ed0e09..cca51e63e 100644
--- a/src/zenstore/cache/cacherpc.cpp
+++ b/src/zenstore/cache/cacherpc.cpp
@@ -10,12 +10,12 @@
 #include <zencore/scopeguard.h>
 #include <zencore/timer.h>
 #include <zencore/trace.h>
+#include <zenhttp/packageformat.h>
 #include <zenstore/cache/cacheshared.h>
 #include <zenstore/cache/structuredcachestore.h>
 #include <zenstore/cache/upstreamcacheclient.h>
 #include <zenstore/cidstore.h>
 #include <zenutil/cache/cacherequests.h>
-#include <zenutil/packageformat.h>
 #include <zenutil/workerpools.h>
 
 #include <zencore/memory/llm.h>
diff --git a/src/zenstore/chunkedfile.cpp b/src/zenstore/chunkedfile.cpp
index 0b66c7b9b..0f3cf5112 100644
--- a/src/zenstore/chunkedfile.cpp
+++ b/src/zenstore/chunkedfile.cpp
@@ -1,7 +1,7 @@
 // Copyright Epic Games, Inc. All Rights Reserved.
 
+#include <zencore/basicfile.h>
 #include <zenstore/chunkedfile.h>
-#include <zenutil/basicfile.h>
 
 #include "chunking.h"
 
diff --git a/src/zenstore/filecas.cpp b/src/zenstore/filecas.cpp
index 82dbe3551..110baaf5f 100644
--- a/src/zenstore/filecas.cpp
+++ b/src/zenstore/filecas.cpp
@@ -2,6 +2,7 @@
 
 #include "filecas.h"
 
+#include <zencore/basicfile.h>
 #include <zencore/compress.h>
 #include <zencore/except.h>
 #include <zencore/filesystem.h>
@@ -19,7 +20,6 @@
 #include <zencore/workthreadpool.h>
 #include <zenstore/gc.h>
 #include <zenstore/scrubcontext.h>
-#include <zenutil/basicfile.h>
 
 #if ZEN_WITH_TESTS
 #	include <zencore/compactbinarybuilder.h>
diff --git a/src/zenstore/gc.cpp b/src/zenstore/gc.cpp
index 50588b8c0..7ac10d613 100644
--- a/src/zenstore/gc.cpp
+++ b/src/zenstore/gc.cpp
@@ -1810,7 +1810,7 @@ GcScheduler::AppendGCLog(std::string_view Id, GcClock::TimePoint StartTime, cons
 		}
 		else
 		{
-			ZEN_ERROR("writing gc result failed with system error exception: '{}'", SystemError.what());
+			ZEN_ERROR("writing gc result failed with system error exception: '{}' ({})", SystemError.what(), SystemError.code().value());
 		}
 	}
 	catch (const std::bad_alloc& BadAlloc)
@@ -2274,7 +2274,9 @@ GcScheduler::SchedulerThread()
 			}
 			else
 			{
-				ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}'", SystemError.what());
+				ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}' ({})",
+						  SystemError.what(),
+						  SystemError.code().value());
 			}
 			m_LastGcTime			= GcClock::Now();
 			m_LastLightweightGcTime = m_LastGcTime;
@@ -2596,11 +2598,15 @@ GcScheduler::CollectGarbage(const GcClock::TimePoint& CacheExpireTime,
 					}
 					if (RetryCount == 0)
 					{
-						ZEN_ERROR("writing gc scheduler state failed with system error exception: '{}'", SystemError.what());
+						ZEN_ERROR("writing gc scheduler state failed with system error exception: '{}' ({})",
+								  SystemError.what(),
+								  SystemError.code().value());
 					}
 					else
 					{
-						ZEN_WARN("writing gc scheduler state failed with system error exception: '{}'", SystemError.what());
+						ZEN_WARN("writing gc scheduler state failed with system error exception: '{}' ({})",
+								 SystemError.what(),
+								 SystemError.code().value());
 					}
 				}
 				catch (const std::bad_alloc& BadAlloc)
@@ -2636,11 +2642,15 @@ GcScheduler::CollectGarbage(const GcClock::TimePoint& CacheExpireTime,
 		{
 			if (SilenceErrors)
 			{
-				ZEN_WARN("scheduling garbage collection failed with system error exception: '{}'", SystemError.what());
+				ZEN_WARN("scheduling garbage collection failed with system error exception: '{}' ({})",
+						 SystemError.what(),
+						 SystemError.code().value());
 			}
 			else
 			{
-				ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}'", SystemError.what());
+				ZEN_ERROR("scheduling garbage collection failed with system error exception: '{}' ({})",
+						  SystemError.what(),
+						  SystemError.code().value());
 			}
 		}
 		m_LastGcTime			= GcClock::Now();
diff --git a/src/zenstore/include/zenstore/blockstore.h b/src/zenstore/include/zenstore/blockstore.h
index 8f8f2ccd7..97357e5cb 100644
--- a/src/zenstore/include/zenstore/blockstore.h
+++ b/src/zenstore/include/zenstore/blockstore.h
@@ -2,9 +2,9 @@
 
 #pragma once
 
+#include <zencore/basicfile.h>
 #include <zencore/filesystem.h>
 #include <zencore/zencore.h>
-#include <zenutil/basicfile.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <tsl/robin_map.h>
diff --git a/src/zenstore/include/zenstore/caslog.h b/src/zenstore/include/zenstore/caslog.h
index edb4f8d9b..3d95c9c90 100644
--- a/src/zenstore/include/zenstore/caslog.h
+++ b/src/zenstore/include/zenstore/caslog.h
@@ -2,8 +2,8 @@
 
 #pragma once
 
+#include <zencore/basicfile.h>
 #include <zencore/uid.h>
-#include <zenutil/basicfile.h>
 
 namespace zen {
 
diff --git a/src/zenstore/workspaces.cpp b/src/zenstore/workspaces.cpp
index 80e03296c..d399ffc88 100644
--- a/src/zenstore/workspaces.cpp
+++ b/src/zenstore/workspaces.cpp
@@ -2,13 +2,13 @@
 
 #include "zenstore/workspaces.h"
 
+#include <zencore/basicfile.h>
 #include <zencore/compactbinarybuilder.h>
 #include <zencore/fmtutils.h>
 #include <zencore/scopeguard.h>
 #include <zencore/timer.h>
 #include <zencore/trace.h>
 #include <zencore/workthreadpool.h>
-#include <zenutil/basicfile.h>
 
 ZEN_THIRD_PARTY_INCLUDES_START
 #include <tsl/robin_set.h>