Style: Harmonize header includes in platform ports

This applies our existing style guide, and adds a new rule to that style
guide for modular components such as platform ports and modules:

Includes from the platform port or module should be included with relative
paths (relative to the root folder of the modular component, e.g.
`platform/linuxbsd/`), in their own section before Godot's "core" includes.

The `api` and `export` subfolders also need to be handled as self-contained
(and thus use relative paths for their "local" includes) as they are all
compiled for each editor platform, without necessarily having the api/export
matching platform folder in the include path.
E.g. the Linux editor build will compile `platform/android/{api,export}/*.cpp`
and those need to use relative includes for it to work.

22 files changed, 72 insertions, 56 deletions

diff --git a/platform/ios/api/api.cpp b/platform/ios/api/api.cpp
index 51afe05310..b8c9e7e9aa 100644
--- a/platform/ios/api/api.cpp
+++ b/platform/ios/api/api.cpp
@@ -45,4 +45,4 @@ void unregister_ios_api() {
 void register_ios_api() {}
 void unregister_ios_api() {}
 
-#endif
+#endif // IOS_ENABLED
diff --git a/platform/ios/app_delegate.mm b/platform/ios/app_delegate.mm
index 45f74e6b7b..38846e7508 100644
--- a/platform/ios/app_delegate.mm
+++ b/platform/ios/app_delegate.mm
@@ -30,13 +30,14 @@
 
 #import "app_delegate.h"
 
-#include "core/config/project_settings.h"
-#include "drivers/coreaudio/audio_driver_coreaudio.h"
 #import "godot_view.h"
-#include "main/main.h"
-#include "os_ios.h"
+#import "os_ios.h"
 #import "view_controller.h"
 
+#include "core/config/project_settings.h"
+#import "drivers/coreaudio/audio_driver_coreaudio.h"
+#include "main/main.h"
+
 #import <AVFoundation/AVFoundation.h>
 #import <AudioToolbox/AudioServices.h>
 
diff --git a/platform/ios/display_layer.mm b/platform/ios/display_layer.mm
index 3129ebb276..27cde1c6c2 100644
--- a/platform/ios/display_layer.mm
+++ b/platform/ios/display_layer.mm
@@ -30,11 +30,12 @@
 
 #import "display_layer.h"
 
+#import "display_server_ios.h"
+#import "os_ios.h"
+
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
-#include "display_server_ios.h"
 #include "main/main.h"
-#include "os_ios.h"
 #include "servers/audio_server.h"
 
 #import <AudioToolbox/AudioServices.h>
diff --git a/platform/ios/display_server_ios.h b/platform/ios/display_server_ios.h
index 57f601a858..b29bdeec62 100644
--- a/platform/ios/display_server_ios.h
+++ b/platform/ios/display_server_ios.h
@@ -35,17 +35,17 @@
 #include "servers/display_server.h"
 
 #if defined(VULKAN_ENABLED)
+#import "vulkan_context_ios.h"
+
 #include "drivers/vulkan/rendering_device_vulkan.h"
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
 
-#include "vulkan_context_ios.h"
-
 #ifdef USE_VOLK
 #include <volk.h>
 #else
 #include <vulkan/vulkan.h>
 #endif
-#endif
+#endif // VULKAN_ENABLED
 
 #if defined(GLES3_ENABLED)
 #include "drivers/gles3/rasterizer_gles3.h"
diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm
index a52d2b185d..5637931e73 100644
--- a/platform/ios/display_server_ios.mm
+++ b/platform/ios/display_server_ios.mm
@@ -28,20 +28,21 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "display_server_ios.h"
+#import "display_server_ios.h"
 
 #import "app_delegate.h"
-#include "core/config/project_settings.h"
-#include "core/io/file_access_pack.h"
 #import "device_metrics.h"
 #import "godot_view.h"
-#include "ios.h"
+#import "ios.h"
 #import "key_mapping_ios.h"
 #import "keyboard_input_view.h"
-#include "os_ios.h"
-#include "tts_ios.h"
+#import "os_ios.h"
+#import "tts_ios.h"
 #import "view_controller.h"
 
+#include "core/config/project_settings.h"
+#include "core/io/file_access_pack.h"
+
 #import <sys/utsname.h>
 
 static const float kDisplayServerIOSAcceleration = 1.f;
diff --git a/platform/ios/export/export.cpp b/platform/ios/export/export.cpp
index f4b90d8883..e07a135861 100644
--- a/platform/ios/export/export.cpp
+++ b/platform/ios/export/export.cpp
@@ -30,9 +30,10 @@
 
 #include "export.h"
 
-#include "editor/export/editor_export.h"
 #include "export_plugin.h"
 
+#include "editor/export/editor_export.h"
+
 void register_ios_exporter_types() {
 	GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformIOS);
 }
diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp
index 06741a12e4..ae0d120513 100644
--- a/platform/ios/export/export_plugin.cpp
+++ b/platform/ios/export/export_plugin.cpp
@@ -30,11 +30,12 @@
 
 #include "export_plugin.h"
 
+#include "../logo_svg.gen.h"
+
 #include "core/string/translation.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/export/editor_export.h"
-#include "platform/ios/logo_svg.gen.h"
 
 #include "modules/modules_enabled.gen.h" // For svg.
 #ifdef MODULE_SVG_ENABLED
diff --git a/platform/ios/export/export_plugin.h b/platform/ios/export/export_plugin.h
index 9afefef121..2e461c8ed6 100644
--- a/platform/ios/export/export_plugin.h
+++ b/platform/ios/export/export_plugin.h
@@ -31,6 +31,8 @@
 #ifndef IOS_EXPORT_PLUGIN_H
 #define IOS_EXPORT_PLUGIN_H
 
+#include "godot_plugin_config.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/image_loader.h"
@@ -43,10 +45,8 @@
 #include "editor/editor_settings.h"
 #include "editor/export/editor_export_platform.h"
 #include "main/splash.gen.h"
-#include "string.h"
-
-#include "godot_plugin_config.h"
 
+#include <string.h>
 #include <sys/stat.h>
 
 // Optional environment variables for defining confidential information. If any
diff --git a/platform/ios/godot_ios.mm b/platform/ios/godot_ios.mm
index b01e339211..5e66c8b47b 100644
--- a/platform/ios/godot_ios.mm
+++ b/platform/ios/godot_ios.mm
@@ -28,9 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#import "os_ios.h"
+
 #include "core/string/ustring.h"
 #include "main/main.h"
-#include "os_ios.h"
 
 #include <stdio.h>
 #include <string.h>
diff --git a/platform/ios/godot_view.mm b/platform/ios/godot_view.mm
index ff04ea9838..4c9a75fdc0 100644
--- a/platform/ios/godot_view.mm
+++ b/platform/ios/godot_view.mm
@@ -30,12 +30,13 @@
 
 #import "godot_view.h"
 
+#import "display_layer.h"
+#import "display_server_ios.h"
+#import "godot_view_renderer.h"
+
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
 #include "core/string/ustring.h"
-#import "display_layer.h"
-#include "display_server_ios.h"
-#import "godot_view_renderer.h"
 
 #import <CoreMotion/CoreMotion.h>
 
diff --git a/platform/ios/godot_view_renderer.mm b/platform/ios/godot_view_renderer.mm
index 714952943b..9c56ca342f 100644
--- a/platform/ios/godot_view_renderer.mm
+++ b/platform/ios/godot_view_renderer.mm
@@ -30,11 +30,12 @@
 
 #import "godot_view_renderer.h"
 
+#import "display_server_ios.h"
+#import "os_ios.h"
+
 #include "core/config/project_settings.h"
 #include "core/os/keyboard.h"
-#import "display_server_ios.h"
 #include "main/main.h"
-#include "os_ios.h"
 #include "servers/audio_server.h"
 
 #import <AudioToolbox/AudioServices.h>
diff --git a/platform/ios/ios.h b/platform/ios/ios.h
index ec2dbd5bf2..d488cde257 100644
--- a/platform/ios/ios.h
+++ b/platform/ios/ios.h
@@ -32,6 +32,7 @@
 #define IOS_H
 
 #include "core/object/class_db.h"
+
 #import <CoreHaptics/CoreHaptics.h>
 
 class iOS : public Object {
diff --git a/platform/ios/ios.mm b/platform/ios/ios.mm
index c911a512a5..0a2e1fd5cd 100644
--- a/platform/ios/ios.mm
+++ b/platform/ios/ios.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "ios.h"
+#import "ios.h"
 
 #import "app_delegate.h"
 #import "view_controller.h"
diff --git a/platform/ios/joypad_ios.mm b/platform/ios/joypad_ios.mm
index 421c82dfc4..38d3ce728a 100644
--- a/platform/ios/joypad_ios.mm
+++ b/platform/ios/joypad_ios.mm
@@ -30,13 +30,12 @@
 
 #import "joypad_ios.h"
 
-#include "core/config/project_settings.h"
-#include "drivers/coreaudio/audio_driver_coreaudio.h"
-#include "main/main.h"
-
 #import "godot_view.h"
+#import "os_ios.h"
 
-#include "os_ios.h"
+#include "core/config/project_settings.h"
+#import "drivers/coreaudio/audio_driver_coreaudio.h"
+#include "main/main.h"
 
 JoypadIOS::JoypadIOS() {
 	observer = [[JoypadIOSObserver alloc] init];
diff --git a/platform/ios/key_mapping_ios.mm b/platform/ios/key_mapping_ios.mm
index c378186778..d2c84884d1 100644
--- a/platform/ios/key_mapping_ios.mm
+++ b/platform/ios/key_mapping_ios.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "key_mapping_ios.h"
+#import "key_mapping_ios.h"
 
 #include "core/templates/hash_map.h"
 
diff --git a/platform/ios/keyboard_input_view.mm b/platform/ios/keyboard_input_view.mm
index 2764403d68..bc6eb63ed5 100644
--- a/platform/ios/keyboard_input_view.mm
+++ b/platform/ios/keyboard_input_view.mm
@@ -30,9 +30,10 @@
 
 #import "keyboard_input_view.h"
 
+#import "display_server_ios.h"
+#import "os_ios.h"
+
 #include "core/os/keyboard.h"
-#include "display_server_ios.h"
-#include "os_ios.h"
 
 @interface GodotKeyboardInputView () <UITextViewDelegate>
 
diff --git a/platform/ios/os_ios.h b/platform/ios/os_ios.h
index cc95e4cdde..9dc5e11497 100644
--- a/platform/ios/os_ios.h
+++ b/platform/ios/os_ios.h
@@ -33,16 +33,18 @@
 
 #ifdef IOS_ENABLED
 
-#include "drivers/coreaudio/audio_driver_coreaudio.h"
+#import "ios.h"
+#import "joypad_ios.h"
+
+#import "drivers/coreaudio/audio_driver_coreaudio.h"
 #include "drivers/unix/os_unix.h"
-#include "ios.h"
-#include "joypad_ios.h"
 #include "servers/audio_server.h"
 #include "servers/rendering/renderer_compositor.h"
 
 #if defined(VULKAN_ENABLED)
+#import "vulkan_context_ios.h"
+
 #include "drivers/vulkan/rendering_device_vulkan.h"
-#include "platform/ios/vulkan_context_ios.h"
 #endif
 
 class OS_IOS : public OS_Unix {
diff --git a/platform/ios/os_ios.mm b/platform/ios/os_ios.mm
index 739db419a3..461c226070 100644
--- a/platform/ios/os_ios.mm
+++ b/platform/ios/os_ios.mm
@@ -28,20 +28,21 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifdef IOS_ENABLED
+#import "os_ios.h"
 
-#include "os_ios.h"
+#ifdef IOS_ENABLED
 
 #import "app_delegate.h"
+#import "display_server_ios.h"
+#import "godot_view.h"
+#import "view_controller.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/file_access_pack.h"
-#include "display_server_ios.h"
 #include "drivers/unix/syslog_logger.h"
-#import "godot_view.h"
 #include "main/main.h"
-#import "view_controller.h"
 
 #import <AudioToolbox/AudioServices.h>
 #import <CoreText/CoreText.h>
@@ -51,6 +52,7 @@
 
 #if defined(VULKAN_ENABLED)
 #include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
+
 #import <QuartzCore/CAMetalLayer.h>
 #ifdef USE_VOLK
 #include <volk.h>
diff --git a/platform/ios/tts_ios.h b/platform/ios/tts_ios.h
index 7f9d30b22b..217f55da66 100644
--- a/platform/ios/tts_ios.h
+++ b/platform/ios/tts_ios.h
@@ -31,18 +31,18 @@
 #ifndef TTS_IOS_H
 #define TTS_IOS_H
 
-#if __has_include(<AVFAudio/AVSpeechSynthesis.h>)
-#import <AVFAudio/AVSpeechSynthesis.h>
-#else
-#import <AVFoundation/AVFoundation.h>
-#endif
-
 #include "core/string/ustring.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/list.h"
 #include "core/variant/array.h"
 #include "servers/display_server.h"
 
+#if __has_include(<AVFAudio/AVSpeechSynthesis.h>)
+#import <AVFAudio/AVSpeechSynthesis.h>
+#else
+#import <AVFoundation/AVFoundation.h>
+#endif
+
 @interface TTS_IOS : NSObject <AVSpeechSynthesizerDelegate> {
 	bool speaking;
 	HashMap<id, int> ids;
diff --git a/platform/ios/tts_ios.mm b/platform/ios/tts_ios.mm
index ee0d6e8591..33b30b17c9 100644
--- a/platform/ios/tts_ios.mm
+++ b/platform/ios/tts_ios.mm
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#include "tts_ios.h"
+#import "tts_ios.h"
 
 @implementation TTS_IOS
 
diff --git a/platform/ios/view_controller.mm b/platform/ios/view_controller.mm
index 8709252623..0ef61da646 100644
--- a/platform/ios/view_controller.mm
+++ b/platform/ios/view_controller.mm
@@ -29,13 +29,15 @@
 /**************************************************************************/
 
 #import "view_controller.h"
-#include "core/config/project_settings.h"
-#include "display_server_ios.h"
+
+#import "display_server_ios.h"
 #import "godot_view.h"
 #import "godot_view_renderer.h"
 #import "key_mapping_ios.h"
 #import "keyboard_input_view.h"
-#include "os_ios.h"
+#import "os_ios.h"
+
+#include "core/config/project_settings.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <GameController/GameController.h>
diff --git a/platform/ios/vulkan_context_ios.mm b/platform/ios/vulkan_context_ios.mm
index c48ff841f2..56f1894e06 100644
--- a/platform/ios/vulkan_context_ios.mm
+++ b/platform/ios/vulkan_context_ios.mm
@@ -28,9 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#import "vulkan_context_ios.h"
+
 #ifdef VULKAN_ENABLED
 
-#include "vulkan_context_ios.h"
 #ifdef USE_VOLK
 #include <volk.h>
 #else