diff --git a/include/cripts/Instance.hpp b/include/cripts/Instance.hpp
index bf0af5f622b..d29905a2d1f 100644
--- a/include/cripts/Instance.hpp
+++ b/include/cripts/Instance.hpp
@@ -18,9 +18,12 @@
 #pragma once
 
 #include <array>
+#include <utility>
 #include <variant>
 #include <unordered_map>
 
+#include <fmt/format.h>
+
 #include "ts/ts.h"
 #include "ts/remap.h"
 
@@ -106,7 +109,7 @@ class Instance
   debug(fmt::format_string<T...> fmt, T &&...args) const
   {
     if (DebugOn()) {
-      auto str = fmt::vformat(fmt, fmt::make_format_args(args...));
+      auto str = fmt::format(fmt, std::forward<T>(args)...);
 
       Dbg(dbg_ctl_cript, "%s", str.c_str());
     }
diff --git a/include/cripts/Lulu.hpp b/include/cripts/Lulu.hpp
index 4025b8527b6..7e3265c2716 100644
--- a/include/cripts/Lulu.hpp
+++ b/include/cripts/Lulu.hpp
@@ -26,7 +26,7 @@
 #include <type_traits>
 #include <chrono>
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "swoc/TextView.h"
 #include "ts/ts.h"
diff --git a/include/cripts/Preamble.hpp b/include/cripts/Preamble.hpp
index 5a2b4b8e969..8d8d5f0bf6d 100644
--- a/include/cripts/Preamble.hpp
+++ b/include/cripts/Preamble.hpp
@@ -27,7 +27,7 @@
 #include <climits>
 #include <iostream> // Useful for debugging
 
-#include <fmt/core.h>
+#include <fmt/format.h>
 
 #include "ts/ts.h"
 #include "ts/remap.h"