diff --git a/src/algorithms/tracking/ActsGeometryProvider.cc b/src/algorithms/tracking/ActsGeometryProvider.cc
index 32cb4a5a1e..7809980baa 100644
--- a/src/algorithms/tracking/ActsGeometryProvider.cc
+++ b/src/algorithms/tracking/ActsGeometryProvider.cc
@@ -19,10 +19,22 @@
 #include <Acts/Plugins/Json/JsonMaterialDecorator.hpp>
 #include <Acts/Plugins/Json/MaterialMapJsonConverter.hpp>
 
-
 #include "extensions/spdlog/SpdlogToActs.h"
 #include "extensions/spdlog/SpdlogFormatters.h"
 
+// Formatter for Eigen matrices
+#if FMT_VERSION >= 90000
+#include <Eigen/Core>
+template <typename T>
+struct fmt::formatter<
+    T,
+    std::enable_if_t<
+        std::is_base_of_v<Eigen::MatrixBase<T>, T>,
+        char
+    >
+> : fmt::ostream_formatter {};
+#endif // FMT_VERSION >= 90000
+
 void draw_surfaces(std::shared_ptr<const Acts::TrackingGeometry> trk_geo, const Acts::GeometryContext geo_ctx,
                    const std::string &fname) {
     using namespace Acts;
diff --git a/src/algorithms/tracking/TrackProjector.cc b/src/algorithms/tracking/TrackProjector.cc
index 6935ebd425..18af5e3c58 100644
--- a/src/algorithms/tracking/TrackProjector.cc
+++ b/src/algorithms/tracking/TrackProjector.cc
@@ -37,6 +37,10 @@
 
 #include <cmath>
 
+#if FMT_VERSION >= 90000
+template<> struct fmt::formatter<Acts::GeometryIdentifier> : fmt::ostream_formatter {};
+#endif // FMT_VERSION >= 90000
+
 namespace eicrecon {
 
     void
diff --git a/src/extensions/spdlog/SpdlogFormatters.h b/src/extensions/spdlog/SpdlogFormatters.h
index f0a8c3466f..66f3de5dc4 100644
--- a/src/extensions/spdlog/SpdlogFormatters.h
+++ b/src/extensions/spdlog/SpdlogFormatters.h
@@ -11,42 +11,8 @@
 #include <edm4hep/Vector3f.h>
 #include <edm4hep/Vector3d.h>
 
-#include <Eigen/Core>
-
 #if FMT_VERSION >= 90000
 
-/*
-
-template <typename T, typename = void>
-struct has_output_operator : std::false_type {};
-
-template <typename T>
-struct has_output_operator<T, std::void_t<decltype(std::cout << std::declval<T>())>> : std::true_type {};
-
-template <typename T, typename Char, typename Context>
-struct fmt::formatter<
-    T,
-    std::enable_if_t<
-        !fmt::has_formatter<T, Context>::value &&
-        has_output_operator<T>::value,
-        Char
-    >
-> : fmt::ostream_formatter {};
-
-*/
-
-// handle Eigen CRTP
-template <typename T>
-struct fmt::formatter<
-    T,
-    std::enable_if_t<
-        std::is_base_of_v<Eigen::MatrixBase<T>, T>,
-        char
-    >
-> : fmt::ostream_formatter {};
-
-template<> struct fmt::formatter<Acts::GeometryIdentifier> : fmt::ostream_formatter {};
-
 template<> struct fmt::formatter<edm4eic::Cov2f> : fmt::ostream_formatter {};
 template<> struct fmt::formatter<edm4eic::Cov3f> : fmt::ostream_formatter {};
 template<> struct fmt::formatter<edm4hep::Vector3f> : fmt::ostream_formatter {};