diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h
index 16450f5b6..2d70da207 100644
--- a/common/eqemu_logsys.h
+++ b/common/eqemu_logsys.h
@@ -34,6 +34,7 @@
 #endif
 
 //#define FMT_HEADER_ONLY
+#undef FMT_HEADER_ONLY
 #include <fmt/core.h>
 #include "types.h"
 
diff --git a/common/repositories/base/base_character_expedition_lockouts_repository.h b/common/repositories/base/base_character_expedition_lockouts_repository.h
index 1a5489b87..e90e3906a 100644
--- a/common/repositories/base/base_character_expedition_lockouts_repository.h
+++ b/common/repositories/base/base_character_expedition_lockouts_repository.h
@@ -15,6 +15,7 @@
 #include "../../database.h"
 #include "../../strings.h"
 #include <ctime>
+#include <fmt/format.h>
 
 class BaseCharacterExpeditionLockoutsRepository {
 public:
diff --git a/world/dynamic_zone.cpp b/world/dynamic_zone.cpp
index 3a23c186d..e4f270480 100644
--- a/world/dynamic_zone.cpp
+++ b/world/dynamic_zone.cpp
@@ -7,6 +7,7 @@
 #include "zoneserver.h"
 #include "../common/eqemu_logsys.h"
 #include "../common/repositories/instance_list_repository.h"
+#include <fmt/format.h>
 
 extern ClientList client_list;
 extern ZSList zoneserver_list;
diff --git a/zone/client.cpp b/zone/client.cpp
index 727e69684..5cb65d11d 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -69,6 +69,7 @@ extern volatile bool RunLoops;
 #include "../common/events/player_events.h"
 #include "../common/events/player_event_logs.h"
 #include "dialogue_window.h"
+#include <fmt/format.h>
 
 
 extern QueryServ* QServ;
diff --git a/zone/dynamic_zone.cpp b/zone/dynamic_zone.cpp
index 65087f9ac..a951a72ed 100644
--- a/zone/dynamic_zone.cpp
+++ b/zone/dynamic_zone.cpp
@@ -23,6 +23,7 @@
 #include "expedition.h"
 #include "string_ids.h"
 #include "worldserver.h"
+#include <fmt/format.h>
 
 extern WorldServer worldserver;
 
diff --git a/zone/exp.cpp b/zone/exp.cpp
index 7f5d34ae1..f93564053 100644
--- a/zone/exp.cpp
+++ b/zone/exp.cpp
@@ -36,6 +36,7 @@
 #include "bot.h"
 #include "../common/events/player_event_logs.h"
 #include "worldserver.h"
+#include <fmt/format.h>
 
 extern WorldServer worldserver;
 
diff --git a/zone/expedition.cpp b/zone/expedition.cpp
index 1537b2f06..4fbe66b25 100644
--- a/zone/expedition.cpp
+++ b/zone/expedition.cpp
@@ -26,6 +26,7 @@
 #include "worldserver.h"
 #include "zonedb.h"
 #include "../common/repositories/expedition_lockouts_repository.h"
+#include <fmt/format.h>
 
 extern WorldServer worldserver;
 extern Zone* zone;
diff --git a/zone/expedition_request.cpp b/zone/expedition_request.cpp
index e74697144..437cd4747 100644
--- a/zone/expedition_request.cpp
+++ b/zone/expedition_request.cpp
@@ -25,6 +25,7 @@
 #include "raids.h"
 #include "string_ids.h"
 #include "../common/repositories/character_expedition_lockouts_repository.h"
+#include <fmt/format.h>
 
 constexpr char SystemName[] = "expedition";