diff --git a/cpp/buses/in_process_bus.h b/cpp/buses/in_process_bus.h
index 83648d66..338118bd 100644
--- a/cpp/buses/in_process_bus.h
+++ b/cpp/buses/in_process_bus.h
@@ -12,13 +12,9 @@
 #include <memory>
 #include <mutex>
 #include <unordered_map>
+#include <spdlog/spdlog.h>
 #include "bus.h"
 
-namespace spdlog
-{
-class logger;
-}
-
 class InProcessBus : public Bus
 {
 
diff --git a/cpp/command/command_dispatcher.cpp b/cpp/command/command_dispatcher.cpp
index bd0e0a21..cf7ab332 100644
--- a/cpp/command/command_dispatcher.cpp
+++ b/cpp/command/command_dispatcher.cpp
@@ -8,7 +8,6 @@
 
 #include "command_dispatcher.h"
 #include <fstream>
-#include <spdlog/spdlog.h>
 #include "command_context.h"
 #include "command_executor.h"
 #include "command_image_support.h"
diff --git a/cpp/command/command_dispatcher.h b/cpp/command/command_dispatcher.h
index fb5d42b4..e837eaeb 100644
--- a/cpp/command/command_dispatcher.h
+++ b/cpp/command/command_dispatcher.h
@@ -9,15 +9,12 @@
 #pragma once
 
 #include <string>
+#include <spdlog/spdlog.h>
 #include "shared/s2p_defs.h"
 
 class CommandContext;
 class CommandExecutor;
 class ControllerFactory;
-namespace spdlog
-{
-class logger;
-}
 namespace s2p_interface
 {
 class PbResult;
diff --git a/cpp/command/command_executor.h b/cpp/command/command_executor.h
index 4c7250d5..e61fcdc1 100644
--- a/cpp/command/command_executor.h
+++ b/cpp/command/command_executor.h
@@ -12,6 +12,7 @@
 #include <mutex>
 #include <string>
 #include <unordered_set>
+#include <spdlog/spdlog.h>
 
 class Bus;
 class CommandContext;
@@ -19,10 +20,6 @@ class ControllerFactory;
 class Device;
 class PrimaryDevice;
 class StorageDevice;
-namespace spdlog
-{
-class logger;
-}
 namespace s2p_interface
 {
 class PbCommand;
diff --git a/cpp/command/command_response.h b/cpp/command/command_response.h
index 07123697..cc89077b 100644
--- a/cpp/command/command_response.h
+++ b/cpp/command/command_response.h
@@ -10,13 +10,10 @@
 
 #include <string>
 #include <unordered_set>
+#include <spdlog/spdlog.h>
 #include "generated/s2p_interface.pb.h"
 
 class PrimaryDevice;
-namespace spdlog
-{
-class logger;
-}
 
 using namespace std;
 using namespace spdlog;
diff --git a/cpp/controllers/abstract_controller.h b/cpp/controllers/abstract_controller.h
index 77c4a222..9127aa50 100644
--- a/cpp/controllers/abstract_controller.h
+++ b/cpp/controllers/abstract_controller.h
@@ -11,6 +11,7 @@
 #include <memory>
 #include <span>
 #include <unordered_set>
+#include <spdlog/spdlog.h>
 #include "phase_handler.h"
 #include "shared/s2p_defs.h"
 #include "shared/s2p_formatter.h"
@@ -18,10 +19,6 @@
 class Bus;
 class PrimaryDevice;
 class ScriptGenerator;
-namespace spdlog
-{
-class logger;
-}
 
 using namespace spdlog;
 
diff --git a/cpp/initiator/initiator_executor.h b/cpp/initiator/initiator_executor.h
index 43d3e35a..bd465153 100644
--- a/cpp/initiator/initiator_executor.h
+++ b/cpp/initiator/initiator_executor.h
@@ -10,15 +10,12 @@
 
 #include <memory>
 #include <stdexcept>
+#include <spdlog/spdlog.h>
 #include "shared/s2p_formatter.h"
 #include "shared/scsi.h"
 #include "shared/s2p_defs.h"
 
 class Bus;
-namespace spdlog
-{
-class logger;
-}
 
 using namespace std;
 using namespace spdlog;
diff --git a/cpp/initiator/initiator_util.h b/cpp/initiator/initiator_util.h
index 5036beb4..a4617e16 100644
--- a/cpp/initiator/initiator_util.h
+++ b/cpp/initiator/initiator_util.h
@@ -10,14 +10,11 @@
 
 #include <string>
 #include <tuple>
+#include <spdlog/spdlog.h>
 #include "shared/scsi.h"
 
 class Bus;
 class InitiatorExecutor;
-namespace spdlog
-{
-class logger;
-}
 
 using namespace std;
 using namespace spdlog;
diff --git a/cpp/s2p/s2p_thread.cpp b/cpp/s2p/s2p_thread.cpp
index 8e2b79e8..dfd5089f 100644
--- a/cpp/s2p/s2p_thread.cpp
+++ b/cpp/s2p/s2p_thread.cpp
@@ -15,7 +15,6 @@
 #include "command/command_context.h"
 #include "shared/s2p_exceptions.h"
 
-using namespace spdlog;
 using namespace s2p_util;
 
 string S2pThread::Init(const callback &cb, int port, shared_ptr<logger> logger)
diff --git a/cpp/s2p/s2p_thread.h b/cpp/s2p/s2p_thread.h
index e791530f..73fd83af 100644
--- a/cpp/s2p/s2p_thread.h
+++ b/cpp/s2p/s2p_thread.h
@@ -12,12 +12,9 @@
 #include <memory>
 #include <string>
 #include <thread>
+#include <spdlog/spdlog.h>
 
 class CommandContext;
-namespace spdlog
-{
-class logger;
-}
 
 using namespace std;
 using namespace spdlog;
diff --git a/cpp/s2pdump/board_executor.h b/cpp/s2pdump/board_executor.h
index 21c034d3..73a8447d 100644
--- a/cpp/s2pdump/board_executor.h
+++ b/cpp/s2pdump/board_executor.h
@@ -11,14 +11,10 @@
 #include <cstdint>
 #include <set>
 #include <span>
+#include <spdlog/spdlog.h>
 #include "initiator/initiator_executor.h"
 #include "s2pdump_executor.h"
 
-namespace spdlog
-{
-class logger;
-}
-
 using namespace std;
 using namespace spdlog;
 
diff --git a/cpp/s2pdump/s2pdump_core.h b/cpp/s2pdump/s2pdump_core.h
index 98b97b71..cc5a9078 100644
--- a/cpp/s2pdump/s2pdump_core.h
+++ b/cpp/s2pdump/s2pdump_core.h
@@ -13,14 +13,11 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
+#include <spdlog/spdlog.h>
 #include "buses/bus.h"
 
 class S2pDumpExecutor;
 class SgAdapter;
-namespace spdlog
-{
-class logger;
-}
 
 using namespace std;
 using namespace chrono;
diff --git a/cpp/s2pdump/s2pdump_executor.cpp b/cpp/s2pdump/s2pdump_executor.cpp
index f18ba86c..d8d9fac4 100644
--- a/cpp/s2pdump/s2pdump_executor.cpp
+++ b/cpp/s2pdump/s2pdump_executor.cpp
@@ -2,11 +2,10 @@
 //
 // SCSI2Pi, SCSI device emulator and SCSI tools for the Raspberry Pi
 //
-// Copyright (C) 2023-2024 Uwe Seimet
+// Copyright (C) 2023-2025 Uwe Seimet
 //
 //---------------------------------------------------------------------------
 
-#include <spdlog/spdlog.h>
 #include "s2pdump_executor.h"
 #include "shared/s2p_exceptions.h"
 #include "shared/memory_util.h"
diff --git a/cpp/s2pdump/s2pdump_executor.h b/cpp/s2pdump/s2pdump_executor.h
index 4f16a891..fce27808 100644
--- a/cpp/s2pdump/s2pdump_executor.h
+++ b/cpp/s2pdump/s2pdump_executor.h
@@ -12,11 +12,7 @@
 #include <set>
 #include <span>
 #include <vector>
-
-namespace spdlog
-{
-class logger;
-}
+#include <spdlog/spdlog.h>
 
 using namespace std;
 using namespace spdlog;
diff --git a/cpp/s2pdump/sg_executor.h b/cpp/s2pdump/sg_executor.h
index 81fdfbfc..ccfcf0b8 100644
--- a/cpp/s2pdump/sg_executor.h
+++ b/cpp/s2pdump/sg_executor.h
@@ -11,13 +11,10 @@
 #include <cstdint>
 #include <set>
 #include <span>
+#include <spdlog/spdlog.h>
 #include "s2pdump_executor.h"
 
 class SgAdapter;
-namespace spdlog
-{
-class logger;
-}
 
 using namespace std;
 using namespace spdlog;
diff --git a/cpp/s2pexec/s2pexec_core.h b/cpp/s2pexec/s2pexec_core.h
index d6780f0d..93e8507b 100644
--- a/cpp/s2pexec/s2pexec_core.h
+++ b/cpp/s2pexec/s2pexec_core.h
@@ -8,15 +8,11 @@
 
 #pragma once
 
+#include <spdlog/spdlog.h>
 #include "buses/bus_factory.h"
 #include "shared/s2p_formatter.h"
 #include "s2pexec_executor.h"
 
-namespace spdlog
-{
-class logger;
-}
-
 using namespace std;
 
 class S2pExec
diff --git a/cpp/shared/sg_adapter.h b/cpp/shared/sg_adapter.h
index c8f91c3d..61ec9bf8 100644
--- a/cpp/shared/sg_adapter.h
+++ b/cpp/shared/sg_adapter.h
@@ -10,13 +10,9 @@
 
 #include <memory>
 #include <vector>
+#include <spdlog/spdlog.h>
 #include "shared/command_meta_data.h"
 
-namespace spdlog
-{
-class logger;
-}
-
 using namespace spdlog;
 
 class SgAdapter