diff --git a/deps/baseconfig/src/unichar.h b/deps/baseconfig/src/unichar.h
index de41025a7..de4c57952 100644
--- a/deps/baseconfig/src/unichar.h
+++ b/deps/baseconfig/src/unichar.h
@@ -14,8 +14,6 @@
  */
 #ifndef BASE_UNICHAR_H
 #define BASE_UNICHAR_H
-
-#include "macros.h"
 #include <wchar.h>
 
 #ifdef U_CHAR
diff --git a/src/game/common/bitflags.h b/src/game/common/bitflags.h
index 43ff528f6..f382667ce 100644
--- a/src/game/common/bitflags.h
+++ b/src/game/common/bitflags.h
@@ -14,6 +14,7 @@
  */
 #pragma once
 
+#include "always.h"
 #include "asciistring.h"
 #include "ini.h"
 #include "xfer.h"
diff --git a/src/game/common/system/asciistring.h b/src/game/common/system/asciistring.h
index 3c31da48a..30fca0541 100644
--- a/src/game/common/system/asciistring.h
+++ b/src/game/common/system/asciistring.h
@@ -14,7 +14,7 @@
  */
 #pragma once
 
-#include "unichar.h"
+#include "always.h"
 #include <cstdarg>
 #include <cstddef>
 #include <cstdlib>
diff --git a/src/game/common/system/unicodestring.h b/src/game/common/system/unicodestring.h
index e33a0ebfc..8f9e5c730 100644
--- a/src/game/common/system/unicodestring.h
+++ b/src/game/common/system/unicodestring.h
@@ -14,8 +14,8 @@
  */
 #pragma once
 
+#include "always.h"
 #include "critsection.h"
-#include "unichar.h"
 #include <cstdarg>
 #include <cstddef>