5 files changed, 11 insertions, 9 deletions
diff --git a/platform/macos/export/codesign.h b/platform/macos/export/codesign.h
index fea7b117d0..01e97bca81 100644
--- a/platform/macos/export/codesign.h
+++ b/platform/macos/export/codesign.h
@@ -28,6 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#ifndef MACOS_CODESIGN_H
+#define MACOS_CODESIGN_H
+
 // macOS code signature creation utility.
 //
 // Current implementation has the following limitation:
@@ -38,9 +41,6 @@
 //  - 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 MACOS_CODESIGN_H
-#define MACOS_CODESIGN_H
-
 #include "core/crypto/crypto_core.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
diff --git a/platform/macos/export/export.cpp b/platform/macos/export/export.cpp
index f219616df4..5f9cf22ccf 100644
--- a/platform/macos/export/export.cpp
+++ b/platform/macos/export/export.cpp
@@ -33,12 +33,14 @@
 #include "export_plugin.h"
 
 void register_macos_exporter() {
+#ifndef ANDROID_ENABLED
 	EDITOR_DEF("export/macos/rcodesign", "");
 #ifdef WINDOWS_ENABLED
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/macos/rcodesign", PROPERTY_HINT_GLOBAL_FILE, "*.exe"));
 #else
 	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING, "export/macos/rcodesign", PROPERTY_HINT_GLOBAL_FILE));
 #endif
+#endif
 
 	Ref<EditorExportPlatformMacOS> platform;
 	platform.instantiate();
diff --git a/platform/macos/export/lipo.h b/platform/macos/export/lipo.h
index 516ef99860..6378f9899c 100644
--- a/platform/macos/export/lipo.h
+++ b/platform/macos/export/lipo.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-// Universal / Universal 2 fat binary file creator and extractor.
-
 #ifndef MACOS_LIPO_H
 #define MACOS_LIPO_H
 
+// Universal / Universal 2 fat binary file creator and extractor.
+
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 #include "modules/modules_enabled.gen.h" // For regex.
diff --git a/platform/macos/export/macho.h b/platform/macos/export/macho.h
index 7ef0d9067e..0d42a7013f 100644
--- a/platform/macos/export/macho.h
+++ b/platform/macos/export/macho.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-// Mach-O binary object file format parser and editor.
-
 #ifndef MACOS_MACHO_H
 #define MACOS_MACHO_H
 
+// Mach-O binary object file format parser and editor.
+
 #include "core/crypto/crypto.h"
 #include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
diff --git a/platform/macos/export/plist.h b/platform/macos/export/plist.h
index 79cb928d0a..b3c51a9635 100644
--- a/platform/macos/export/plist.h
+++ b/platform/macos/export/plist.h
@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-// Property list file format (application/x-plist) parser, property list ASN-1 serialization.
-
 #ifndef MACOS_PLIST_H
 #define MACOS_PLIST_H
 
+// Property list file format (application/x-plist) parser, property list ASN-1 serialization.
+
 #include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
 #include "modules/modules_enabled.gen.h" // For regex.