diff --git a/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/base.h b/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/base.h
index 2dabe005ec..27bc81ed29 100644
--- a/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/base.h
+++ b/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/base.h
@@ -150,18 +150,18 @@
 #endif
 
 // Check if exceptions are disabled.
-#ifdef FMT_USE_EXCEPTIONS
+#ifdef CONDUIT_FMT_USE_EXCEPTIONS
 // Use the provided definition.
 #elif defined(__GNUC__) && !defined(__EXCEPTIONS)
-#  define FMT_USE_EXCEPTIONS 0
+#  define CONDUIT_FMT_USE_EXCEPTIONS 0
 #elif defined(__clang__) && !defined(__cpp_exceptions)
-#  define FMT_USE_EXCEPTIONS 0
+#  define CONDUIT_FMT_USE_EXCEPTIONS 0
 #elif FMT_MSC_VERSION && !_HAS_EXCEPTIONS
-#  define FMT_USE_EXCEPTIONS 0
+#  define CONDUIT_FMT_USE_EXCEPTIONS 0
 #else
-#  define FMT_USE_EXCEPTIONS 1
+#  define CONDUIT_FMT_USE_EXCEPTIONS 1
 #endif
-#if FMT_USE_EXCEPTIONS
+#if CONDUIT_FMT_USE_EXCEPTIONS
 #  define FMT_TRY try
 #  define FMT_CATCH(x) catch (x)
 #else
@@ -284,7 +284,7 @@ FMT_PRAGMA_GCC(diagnostic push)
 #  define FMT_WIN32 0
 #endif
 
-#if !defined(FMT_HEADER_ONLY) && FMT_WIN32
+#if !defined(CONDUIT_FMT_HEADER_ONLY) && FMT_WIN32
 #  if defined(FMT_LIB_EXPORT)
 #    define FMT_API __declspec(dllexport)
 #  elif defined(FMT_SHARED)
@@ -3035,7 +3035,7 @@ FMT_PRAGMA_GCC(pop_options)
 FMT_END_EXPORT
 FMT_END_NAMESPACE
 
-#ifdef FMT_HEADER_ONLY
+#ifdef CONDUIT_FMT_HEADER_ONLY
 #  include "format.h"
 #endif
 #endif  // FMT_BASE_H_
diff --git a/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/conduit_fmt.h b/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/conduit_fmt.h
index 7688ce7282..6b25adc722 100644
--- a/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/conduit_fmt.h
+++ b/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/conduit_fmt.h
@@ -11,8 +11,8 @@
 #ifndef CONDUIT_FMT_HPP
 #define CONDUIT_FMT_HPP
 
-#define FMT_EXCEPTIONS 1
-#define FMT_HEADER_ONLY 1
+#define CONDUIT_FMT_USE_EXCEPTIONS 1
+#define CONDUIT_FMT_HEADER_ONLY 1
 
 // Include all fmt header files
 #include "format.h"
diff --git a/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/format.h b/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/format.h
index abaf55833d..507de8b051 100644
--- a/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/format.h
+++ b/src/thirdparty_builtin/fmt-12.1.0/conduit_fmt/format.h
@@ -171,7 +171,7 @@ template <typename T> struct iterator_traits<conduit_fmt::basic_appender<T>> {
 
 #ifdef FMT_THROW
 // Use the provided definition.
-#elif FMT_USE_EXCEPTIONS
+#elif CONDUIT_FMT_USE_EXCEPTIONS
 #  define FMT_THROW(x) throw x
 #else
 #  define FMT_THROW(x) ::conduit_fmt::assert_fail(__FILE__, __LINE__, (x).what())
@@ -1182,7 +1182,7 @@ template <> inline auto decimal_point(locale_ref loc) -> wchar_t {
   return decimal_point_impl<wchar_t>(loc);
 }
 
-#ifndef FMT_HEADER_ONLY
+#ifndef CONDUIT_FMT_HEADER_ONLY
 FMT_BEGIN_EXPORT
 extern template FMT_API auto thousands_sep_impl<char>(locale_ref)
     -> thousands_sep_result<char>;
@@ -1191,7 +1191,7 @@ extern template FMT_API auto thousands_sep_impl<wchar_t>(locale_ref)
 extern template FMT_API auto decimal_point_impl(locale_ref) -> char;
 extern template FMT_API auto decimal_point_impl(locale_ref) -> wchar_t;
 FMT_END_EXPORT
-#endif  // FMT_HEADER_ONLY
+#endif  // CONDUIT_FMT_HEADER_ONLY
 
 // Compares two characters for equality.
 template <typename Char> auto equal2(const Char* lhs, const char* rhs) -> bool {
@@ -4382,7 +4382,7 @@ FMT_NODISCARD FMT_CONSTEXPR_STRING auto to_string(const T& value)
 FMT_END_EXPORT
 FMT_END_NAMESPACE
 
-#ifdef FMT_HEADER_ONLY
+#ifdef CONDUIT_FMT_HEADER_ONLY
 #  define FMT_FUNC inline
 #  include "format-inl.h"
 #endif