diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp
index 6af19d1..05fbec1 100644
--- a/include/modules/keyboard_state.hpp
+++ b/include/modules/keyboard_state.hpp
@@ -1,11 +1,6 @@
 #pragma once
 
-#include <fmt/format.h>
-#if FMT_VERSION < 60000
-#include <fmt/time.h>
-#else
 #include <fmt/chrono.h>
-#endif
 #include <gtkmm/label.h>
 
 #include "AModule.hpp"
diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp
index aa9a0a2..5cbee4c 100644
--- a/include/modules/simpleclock.hpp
+++ b/include/modules/simpleclock.hpp
@@ -1,11 +1,7 @@
 #pragma once
 
-#include <fmt/format.h>
-#if FMT_VERSION < 60000
-#include <fmt/time.h>
-#else
 #include <fmt/chrono.h>
-#endif
+
 #include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"
 
diff --git a/include/util/json.hpp b/include/util/json.hpp
index cc514e1..7cd4355 100644
--- a/include/util/json.hpp
+++ b/include/util/json.hpp
@@ -1,7 +1,15 @@
 #pragma once
 
+#include <fmt/ostream.h>
 #include <json/json.h>
 
+#if (FMT_VERSION >= 90000)
+
+template <>
+struct fmt::formatter<Json::Value> : ostream_formatter {};
+
+#endif
+
 namespace waybar::util {
 
 struct JsonParser {
diff --git a/src/client.cpp b/src/client.cpp
index be2ec91..a815e2f 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1,12 +1,12 @@
 #include "client.hpp"
 
-#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
 
 #include <iostream>
 
 #include "idle-inhibit-unstable-v1-client-protocol.h"
 #include "util/clara.hpp"
+#include "util/format.hpp"
 #include "wlr-layer-shell-unstable-v1-client-protocol.h"
 
 waybar::Client *waybar::Client::inst() {
diff --git a/src/config.cpp b/src/config.cpp
index 5894cb6..dec3b50 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1,6 +1,5 @@
 #include "config.hpp"
 
-#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
 #include <unistd.h>
 #include <wordexp.h>
diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
index 959cad9..467536e 100644
--- a/src/modules/clock.cpp
+++ b/src/modules/clock.cpp
@@ -1,15 +1,10 @@
 #include "modules/clock.hpp"
 
+#include <fmt/chrono.h>
 #include <spdlog/spdlog.h>
 
-#include <iomanip>
-#if FMT_VERSION < 60000
-#include <fmt/time.h>
-#else
-#include <fmt/chrono.h>
-#endif
-
 #include <ctime>
+#include <iomanip>
 #include <sstream>
 #include <type_traits>
 
diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp
index 4d1e8c9..aa1a18f 100644
--- a/src/modules/mpd/state.cpp
+++ b/src/modules/mpd/state.cpp
@@ -10,6 +10,13 @@ namespace waybar::modules {
 }  // namespace waybar::modules
 #endif
 
+#if FMT_VERSION >= 90000
+/* Satisfy fmt 9.x deprecation of implicit conversion of enums to int */
+auto format_as(enum mpd_idle val) {
+  return static_cast<std::underlying_type_t<enum mpd_idle>>(val);
+}
+#endif
+
 namespace waybar::modules::detail {
 
 #define IDLE_RUN_NOIDLE_AND_CMD(...)                                      \
diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
index 560d736..007862d 100644
--- a/src/modules/sni/host.cpp
+++ b/src/modules/sni/host.cpp
@@ -1,6 +1,5 @@
 #include "modules/sni/host.hpp"
 
-#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
 
 namespace waybar::modules::SNI {
diff --git a/src/modules/sway/bar.cpp b/src/modules/sway/bar.cpp
index 26234e3..f28b050 100644
--- a/src/modules/sway/bar.cpp
+++ b/src/modules/sway/bar.cpp
@@ -1,6 +1,5 @@
 #include "modules/sway/bar.hpp"
 
-#include <fmt/ostream.h>
 #include <spdlog/spdlog.h>
 
 #include <sstream>