diff --git a/include/modules/clock.hpp b/include/modules/clock.hpp
index b812b702..aa9a0a22 100644
--- a/include/modules/clock.hpp
+++ b/include/modules/clock.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
 #include <fmt/format.h>
+#if FMT_VERSION < 60000
+#include <fmt/time.h>
+#else
+#include <fmt/chrono.h>
+#endif
 #include "ALabel.hpp"
-#include "fmt/time.h"
 #include "util/sleeper_thread.hpp"
 
 namespace waybar::modules {
diff --git a/src/bar.cpp b/src/bar.cpp
index 8a458696..8e643496 100644
--- a/src/bar.cpp
+++ b/src/bar.cpp
@@ -1,7 +1,7 @@
 #include "bar.hpp"
-#include <spdlog/spdlog.h>
 #include "client.hpp"
 #include "factory.hpp"
+#include <spdlog/spdlog.h>
 
 waybar::Bar::Bar(struct waybar_output* w_output, const Json::Value& w_config)
     : output(w_output),
diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
index 015f756b..c815c654 100644
--- a/src/modules/sni/host.cpp
+++ b/src/modules/sni/host.cpp
@@ -1,6 +1,6 @@
 #include "modules/sni/host.hpp"
-#include <spdlog/spdlog.h>
 #include <fmt/ostream.h>
+#include <spdlog/spdlog.h>
 
 namespace waybar::modules::SNI {