diff --git a/soh/include/z64.h b/soh/include/z64.h
index a16134f08..fdc634e58 100644
--- a/soh/include/z64.h
+++ b/soh/include/z64.h
@@ -30,9 +30,6 @@
 #include "ichain.h"
 #include "regs.h"
 
-#define NOGDI
-#define WIN32_LEAN_AND_MEAN
-
 #if defined(_WIN64) || defined(__x86_64__) || defined(__arm64__)
 #define _SOH64
 #endif
diff --git a/soh/soh/Enhancements/custom_message/CustomMessageManager.h b/soh/soh/Enhancements/custom_message/CustomMessageManager.h
index 207d515e3..aed3fbf9a 100644
--- a/soh/soh/Enhancements/custom_message/CustomMessageManager.h
+++ b/soh/soh/Enhancements/custom_message/CustomMessageManager.h
@@ -1,6 +1,12 @@
 #pragma once
 #include <string>
 #include <unordered_map>
+
+
+#define NOGDI
+#define WIN32_LEAN_AND_MEAN
+
+
 #include <message_data_static.h>
 
 #undef MESSAGE_END