6 files changed, 18 insertions, 18 deletions
diff --git a/platform/macos/export/codesign.h b/platform/macos/export/codesign.h
index 3a08c0ea86..fea7b117d0 100644
--- a/platform/macos/export/codesign.h
+++ b/platform/macos/export/codesign.h
@@ -38,8 +38,8 @@
 //  - Requirements code generator is not implemented (only hard-coded requirements for the ad-hoc signing is supported).
 //  - RFC5652/CMS blob generation is not implemented, supports ad-hoc signing only.
 
-#ifndef CODESIGN_H
-#define CODESIGN_H
+#ifndef MACOS_CODESIGN_H
+#define MACOS_CODESIGN_H
 
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
@@ -365,4 +365,4 @@ public:
 
 #endif // MODULE_REGEX_ENABLED
 
-#endif // CODESIGN_H
+#endif // MACOS_CODESIGN_H
diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp
index 8cb69997d9..fd0781ac50 100644
--- a/platform/macos/export/export_plugin.cpp
+++ b/platform/macos/export/export_plugin.cpp
@@ -766,7 +766,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 
 	int ret = unzGoToFirstFile(src_pkg_zip);
 
-	String binary_to_use = "godot_macos_" + String(p_debug ? "debug" : "release") + ".64";
+	String binary_to_use = "godot_macos_" + String(p_debug ? "debug" : "release") + ".universal";
 
 	String pkg_name;
 	if (String(ProjectSettings::get_singleton()->get("application/config/name")) != "") {
@@ -1064,19 +1064,19 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p
 		}
 
 		if (data.size() > 0) {
-			if (file.find("/data.mono.macos.64.release_debug/") != -1) {
+			if (file.find("/data.mono.macos.release_debug.universal/") != -1) {
 				if (!p_debug) {
 					ret = unzGoToNextFile(src_pkg_zip);
 					continue; // skip
 				}
-				file = file.replace("/data.mono.macos.64.release_debug/", "/GodotSharp/");
+				file = file.replace("/data.mono.macos.release_debug.universal/", "/GodotSharp/");
 			}
-			if (file.find("/data.mono.macos.64.release/") != -1) {
+			if (file.find("/data.mono.macos.release.universal/") != -1) {
 				if (p_debug) {
 					ret = unzGoToNextFile(src_pkg_zip);
 					continue; // skip
 				}
-				file = file.replace("/data.mono.macos.64.release/", "/GodotSharp/");
+				file = file.replace("/data.mono.macos.release.universal/", "/GodotSharp/");
 			}
 
 			if (file.ends_with(".dylib")) {
diff --git a/platform/macos/export/export_plugin.h b/platform/macos/export/export_plugin.h
index 410ec22545..e2e9cc3d22 100644
--- a/platform/macos/export/export_plugin.h
+++ b/platform/macos/export/export_plugin.h
@@ -134,4 +134,4 @@ public:
 	~EditorExportPlatformMacOS();
 };
 
-#endif
+#endif // MACOS_EXPORT_PLUGIN_H
diff --git a/platform/macos/export/lipo.h b/platform/macos/export/lipo.h
index 0e419be17e..516ef99860 100644
--- a/platform/macos/export/lipo.h
+++ b/platform/macos/export/lipo.h
@@ -30,8 +30,8 @@
 
 // Universal / Universal 2 fat binary file creator and extractor.
 
-#ifndef LIPO_H
-#define LIPO_H
+#ifndef MACOS_LIPO_H
+#define MACOS_LIPO_H
 
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
@@ -73,4 +73,4 @@ public:
 
 #endif // MODULE_REGEX_ENABLED
 
-#endif // LIPO_H
+#endif // MACOS_LIPO_H
diff --git a/platform/macos/export/macho.h b/platform/macos/export/macho.h
index 6cfc3c44f5..7ef0d9067e 100644
--- a/platform/macos/export/macho.h
+++ b/platform/macos/export/macho.h
@@ -30,8 +30,8 @@
 
 // Mach-O binary object file format parser and editor.
 
-#ifndef MACHO_H
-#define MACHO_H
+#ifndef MACOS_MACHO_H
+#define MACOS_MACHO_H
 
 #include "core/crypto/crypto.h"
 #include "core/crypto/crypto_core.h"
@@ -212,4 +212,4 @@ public:
 
 #endif // MODULE_REGEX_ENABLED
 
-#endif // MACHO_H
+#endif // MACOS_MACHO_H
diff --git a/platform/macos/export/plist.h b/platform/macos/export/plist.h
index ba9eaec196..79cb928d0a 100644
--- a/platform/macos/export/plist.h
+++ b/platform/macos/export/plist.h
@@ -30,8 +30,8 @@
 
 // Property list file format (application/x-plist) parser, property list ASN-1 serialization.
 
-#ifndef PLIST_H
-#define PLIST_H
+#ifndef MACOS_PLIST_H
+#define MACOS_PLIST_H
 
 #include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
@@ -113,4 +113,4 @@ public:
 
 #endif // MODULE_REGEX_ENABLED
 
-#endif // PLIST_H
+#endif // MACOS_PLIST_H