diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index ef3f443b..d5bedc63 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -13,6 +13,11 @@
 #include <set>
 #include <variant>
 
+#if _WIN32
+#undef near
+#undef far
+#endif
+
 namespace Sapphire {
 namespace Data {
 
diff --git a/src/tools/exd_struct_gen/ExdData.h.tmpl b/src/tools/exd_struct_gen/ExdData.h.tmpl
index d5612d74..4b15822a 100644
--- a/src/tools/exd_struct_gen/ExdData.h.tmpl
+++ b/src/tools/exd_struct_gen/ExdData.h.tmpl
@@ -13,8 +13,12 @@
 #include <set>
 #include <variant>
 
-namespace Sapphire {
-namespace Data {
+#if _WIN32
+#undef near
+#undef far
+#endif
+
+namespace Sapphire::Data {
 
 class ExdDataGenerated;
 
@@ -89,7 +93,6 @@ IDLISTGETTERS
   };
 
 }
-}
 
 #endif
 
diff --git a/src/world/ServerMgr.cpp b/src/world/ServerMgr.cpp
index 0186d396..460b8c98 100644
--- a/src/world/ServerMgr.cpp
+++ b/src/world/ServerMgr.cpp
@@ -26,8 +26,6 @@
 
 #include "Script/ScriptMgr.h"
 
-#include <Exd/ExdDataGenerated.h>
-
 #include <Database/ZoneDbConnection.h>
 #include <Database/DbWorkerPool.h>
 #include "Manager/LinkshellMgr.h"