Style: Harmonize header includes in modules

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 ("local" includes) should be listed
first in their own block using relative paths, before Godot's "core" includes
which use "absolute" (project folder relative) paths, and finally thirdparty
includes.

Includes in `#ifdef`s come after their relevant section, i.e. the overall
structure is:

- Local includes
  * Conditional local includes
- Core includes
  * Conditional core includes
- Thirdparty includes
  * Conditional thirdparty includes

modules/basis_universal/register_types.cpp

@@ -33,12 +33,12 @@
 #include "core/os/os.h"
 #include "servers/rendering_server.h"
 
+#include <transcoder/basisu_transcoder.h>
+
 #ifdef TOOLS_ENABLED
 #include <encoder/basisu_comp.h>
 #endif
 
-#include <transcoder/basisu_transcoder.h>
-
 enum BasisDecompressFormat {
 	BASIS_DECOMPRESS_RG,
 	BASIS_DECOMPRESS_RGB,

modules/camera/camera_macos.mm

@@ -32,6 +32,7 @@
 // If you fix something here, make sure you fix it there as well!
 
 #include "camera_macos.h"
+
 #include "servers/camera/camera_feed.h"
 
 #import <AVFoundation/AVFoundation.h>

modules/csg/csg_shape.h

@@ -31,12 +31,12 @@
 #ifndef CSG_SHAPE_H
 #define CSG_SHAPE_H
 
-#define CSGJS_HEADER_ONLY
-
 #include "csg.h"
+
 #include "scene/3d/path_3d.h"
 #include "scene/3d/visual_instance_3d.h"
 #include "scene/resources/concave_polygon_shape_3d.h"
+
 #include "thirdparty/misc/mikktspace.h"
 
 class CSGShape3D : public GeometryInstance3D {

modules/csg/editor/csg_gizmos.h

@@ -34,6 +34,7 @@
 #ifdef TOOLS_ENABLED
 
 #include "../csg_shape.h"
+
 #include "editor/editor_plugin.h"
 #include "editor/plugins/node_3d_editor_gizmos.h"
 

modules/cvtt/register_types.cpp

@@ -49,4 +49,4 @@ void uninitialize_cvtt_module(ModuleInitializationLevel p_level) {
 	}
 }
 
-#endif
+#endif // TOOLS_ENABLED

modules/denoise/denoise_wrapper.cpp

@@ -29,7 +29,9 @@
 /**************************************************************************/
 
 #include "denoise_wrapper.h"
-#include "thirdparty/oidn/include/OpenImageDenoise/oidn.h"
+
+#include <OpenImageDenoise/oidn.h>
+
 #include <stdio.h>
 
 void *oidn_denoiser_init() {

modules/denoise/lightmap_denoiser.cpp

@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "lightmap_denoiser.h"
+
 #include "denoise_wrapper.h"
 
 #include "core/io/image.h"

modules/denoise/register_types.cpp

@@ -29,9 +29,11 @@
 /**************************************************************************/
 
 #include "register_types.h"
-#include "core/config/engine.h"
+
 #include "lightmap_denoiser.h"
 
+#include "core/config/engine.h"
+
 void initialize_denoise_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;

modules/enet/enet_connection.h

@@ -31,10 +31,10 @@
 #ifndef ENET_CONNECTION_H
 #define ENET_CONNECTION_H
 
-#include "core/object/ref_counted.h"
+#include "enet_packet_peer.h"
 
 #include "core/crypto/crypto.h"
-#include "enet_packet_peer.h"
+#include "core/object/ref_counted.h"
 
 #include <enet/enet.h>
 

modules/enet/enet_multiplayer_peer.cpp

@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "enet_multiplayer_peer.h"
+
 #include "core/io/ip.h"
 #include "core/io/marshalls.h"
 #include "core/os/os.h"

modules/enet/enet_multiplayer_peer.h

@@ -31,10 +31,11 @@
 #ifndef ENET_MULTIPLAYER_PEER_H
 #define ENET_MULTIPLAYER_PEER_H
 
+#include "enet_connection.h"
+
 #include "core/crypto/crypto.h"
 #include "scene/main/multiplayer_peer.h"
 
-#include "enet_connection.h"
 #include <enet/enet.h>
 
 class ENetMultiplayerPeer : public MultiplayerPeer {

modules/enet/register_types.cpp

@@ -29,11 +29,13 @@
 /**************************************************************************/
 
 #include "register_types.h"
-#include "core/error/error_macros.h"
+
 #include "enet_connection.h"
 #include "enet_multiplayer_peer.h"
 #include "enet_packet_peer.h"
 
+#include "core/error/error_macros.h"
+
 static bool enet_ok = false;
 
 void initialize_enet_module(ModuleInitializationLevel p_level) {

modules/etcpak/register_types.h

@@ -33,8 +33,6 @@
 
 #include "modules/register_module_types.h"
 
-#include "modules/register_module_types.h"
-
 void initialize_etcpak_module(ModuleInitializationLevel p_level);
 void uninitialize_etcpak_module(ModuleInitializationLevel p_level);
 

modules/gdscript/editor/gdscript_docgen.cpp

@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "gdscript_docgen.h"
+
 #include "../gdscript.h"
 
 using GDP = GDScriptParser;

modules/gdscript/editor/gdscript_docgen.h

@@ -32,6 +32,7 @@
 #define GDSCRIPT_DOCGEN_H
 
 #include "../gdscript_parser.h"
+
 #include "core/doc_data.h"
 
 class GDScriptDocGen {

modules/gdscript/editor/gdscript_highlighter.cpp

@@ -29,8 +29,10 @@
 /**************************************************************************/
 
 #include "gdscript_highlighter.h"
+
 #include "../gdscript.h"
 #include "../gdscript_tokenizer.h"
+
 #include "core/config/project_settings.h"
 #include "editor/editor_settings.h"
 

modules/gdscript/editor/gdscript_translation_parser_plugin.cpp

@@ -30,8 +30,9 @@
 
 #include "gdscript_translation_parser_plugin.h"
 
+#include "../gdscript.h"
+
 #include "core/io/resource_loader.h"
-#include "modules/gdscript/gdscript.h"
 
 void GDScriptEditorTranslationParserPlugin::get_recognized_extensions(List<String> *r_extensions) const {
 	GDScriptLanguage::get_singleton()->get_recognized_extensions(r_extensions);

modules/gdscript/editor/gdscript_translation_parser_plugin.h

@@ -31,9 +31,10 @@
 #ifndef GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
 #define GDSCRIPT_TRANSLATION_PARSER_PLUGIN_H
 
+#include "../gdscript_parser.h"
+
 #include "core/templates/hash_set.h"
 #include "editor/editor_translation_parser.h"
-#include "modules/gdscript/gdscript_parser.h"
 
 class GDScriptEditorTranslationParserPlugin : public EditorTranslationParserPlugin {
 	GDCLASS(GDScriptEditorTranslationParserPlugin, EditorTranslationParserPlugin);

modules/gdscript/gdscript.cpp

@@ -30,15 +30,6 @@
 
 #include "gdscript.h"
 
-#include <stdint.h>
-
-#include "core/config/engine.h"
-#include "core/config/project_settings.h"
-#include "core/core_constants.h"
-#include "core/core_string_names.h"
-#include "core/io/file_access.h"
-#include "core/io/file_access_encrypted.h"
-#include "core/os/os.h"
 #include "gdscript_analyzer.h"
 #include "gdscript_cache.h"
 #include "gdscript_compiler.h"
@@ -46,15 +37,28 @@
 #include "gdscript_rpc_callable.h"
 #include "gdscript_warning.h"
 
+#ifdef TOOLS_ENABLED
+#include "editor/gdscript_docgen.h"
+#endif
+
 #ifdef TESTS_ENABLED
 #include "tests/gdscript_test_runner.h"
 #endif
 
+#include "core/config/engine.h"
+#include "core/config/project_settings.h"
+#include "core/core_constants.h"
+#include "core/core_string_names.h"
+#include "core/io/file_access.h"
+#include "core/io/file_access_encrypted.h"
+#include "core/os/os.h"
+
 #ifdef TOOLS_ENABLED
 #include "editor/editor_paths.h"
-#include "editor/gdscript_docgen.h"
 #endif
 
+#include <stdint.h>
+
 ///////////////////////////
 
 GDScriptNativeClass::GDScriptNativeClass(const StringName &p_name) {

modules/gdscript/gdscript.h

@@ -31,6 +31,8 @@
 #ifndef GDSCRIPT_H
 #define GDSCRIPT_H
 
+#include "gdscript_function.h"
+
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
 #include "core/doc_data.h"
@@ -38,7 +40,6 @@
 #include "core/io/resource_saver.h"
 #include "core/object/script_language.h"
 #include "core/templates/rb_set.h"
-#include "gdscript_function.h"
 
 class GDScriptNativeClass : public RefCounted {
 	GDCLASS(GDScriptNativeClass, RefCounted);

modules/gdscript/gdscript_analyzer.cpp

@@ -30,6 +30,9 @@
 
 #include "gdscript_analyzer.h"
 
+#include "gdscript.h"
+#include "gdscript_utility_functions.h"
+
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/core_constants.h"
@@ -39,8 +42,6 @@
 #include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/templates/hash_map.h"
-#include "gdscript.h"
-#include "gdscript_utility_functions.h"
 #include "scene/resources/packed_scene.h"
 
 #if defined(TOOLS_ENABLED) && !defined(DISABLE_DEPRECATED)

modules/gdscript/gdscript_analyzer.h

@@ -31,11 +31,12 @@
 #ifndef GDSCRIPT_ANALYZER_H
 #define GDSCRIPT_ANALYZER_H
 
+#include "gdscript_cache.h"
+#include "gdscript_parser.h"
+
 #include "core/object/object.h"
 #include "core/object/ref_counted.h"
 #include "core/templates/hash_set.h"
-#include "gdscript_cache.h"
-#include "gdscript_parser.h"
 
 class GDScriptAnalyzer {
 	GDScriptParser *parser = nullptr;

modules/gdscript/gdscript_byte_codegen.cpp

@@ -30,9 +30,10 @@
 
 #include "gdscript_byte_codegen.h"
 
-#include "core/debugger/engine_debugger.h"
 #include "gdscript.h"
 
+#include "core/debugger/engine_debugger.h"
+
 uint32_t GDScriptByteCodeGenerator::add_parameter(const StringName &p_name, bool p_is_optional, const GDScriptDataType &p_type) {
 #ifdef TOOLS_ENABLED
 	function->arg_names.push_back(p_name);

modules/gdscript/gdscript_byte_codegen.h

@@ -32,7 +32,6 @@
 #define GDSCRIPT_BYTE_CODEGEN_H
 
 #include "gdscript_codegen.h"
-
 #include "gdscript_function.h"
 #include "gdscript_utility_functions.h"
 

modules/gdscript/gdscript_cache.cpp

@@ -30,12 +30,13 @@
 
 #include "gdscript_cache.h"
 
-#include "core/io/file_access.h"
-#include "core/templates/vector.h"
 #include "gdscript.h"
 #include "gdscript_analyzer.h"
 #include "gdscript_compiler.h"
 #include "gdscript_parser.h"
+
+#include "core/io/file_access.h"
+#include "core/templates/vector.h"
 #include "scene/resources/packed_scene.h"
 
 bool GDScriptParserRef::is_valid() const {

modules/gdscript/gdscript_cache.h

@@ -31,11 +31,12 @@
 #ifndef GDSCRIPT_CACHE_H
 #define GDSCRIPT_CACHE_H
 
+#include "gdscript.h"
+
 #include "core/object/ref_counted.h"
 #include "core/os/mutex.h"
 #include "core/templates/hash_map.h"
 #include "core/templates/hash_set.h"
-#include "gdscript.h"
 #include "scene/resources/packed_scene.h"
 
 class GDScriptAnalyzer;

modules/gdscript/gdscript_codegen.h

@@ -31,11 +31,12 @@
 #ifndef GDSCRIPT_CODEGEN_H
 #define GDSCRIPT_CODEGEN_H
 
-#include "core/string/string_name.h"
-#include "core/variant/variant.h"
 #include "gdscript_function.h"
 #include "gdscript_utility_functions.h"
 
+#include "core/string/string_name.h"
+#include "core/variant/variant.h"
+
 class GDScriptCodeGenerator {
 public:
 	struct Address {

modules/gdscript/gdscript_compiler.h

@@ -31,12 +31,13 @@
 #ifndef GDSCRIPT_COMPILER_H
 #define GDSCRIPT_COMPILER_H
 
-#include "core/templates/hash_set.h"
 #include "gdscript.h"
 #include "gdscript_codegen.h"
 #include "gdscript_function.h"
 #include "gdscript_parser.h"
 
+#include "core/templates/hash_set.h"
+
 class GDScriptCompiler {
 	const GDScriptParser *parser = nullptr;
 	HashSet<GDScript *> parsed_classes;

modules/gdscript/gdscript_disassembler.cpp

@@ -30,10 +30,10 @@
 
 #ifdef DEBUG_ENABLED
 
+#include "gdscript.h"
 #include "gdscript_function.h"
 
 #include "core/string/string_builder.h"
-#include "gdscript.h"
 
 static String _get_variant_string(const Variant &p_variant) {
 	String txt;
@@ -1130,4 +1130,4 @@ void GDScriptFunction::disassemble(const Vector<String> &p_code_lines) const {
 	}
 }
 
-#endif
+#endif // DEBUG_ENABLED

modules/gdscript/gdscript_editor.cpp

@@ -30,20 +30,24 @@
 
 #include "gdscript.h"
 
-#include "core/config/engine.h"
-#include "core/core_constants.h"
-#include "core/io/file_access.h"
 #include "gdscript_analyzer.h"
 #include "gdscript_compiler.h"
 #include "gdscript_parser.h"
 #include "gdscript_tokenizer.h"
 #include "gdscript_utility_functions.h"
 
+#ifdef TOOLS_ENABLED
+#include "editor/script_templates/templates.gen.h"
+#endif
+
+#include "core/config/engine.h"
+#include "core/core_constants.h"
+#include "core/io/file_access.h"
+
 #ifdef TOOLS_ENABLED
 #include "core/config/project_settings.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_settings.h"
-#include "editor/script_templates/templates.gen.h"
 #endif
 
 void GDScriptLanguage::get_comment_delimiters(List<String> *p_delimiters) const {

modules/gdscript/gdscript_function.h

@@ -31,6 +31,8 @@
 #ifndef GDSCRIPT_FUNCTION_H
 #define GDSCRIPT_FUNCTION_H
 
+#include "gdscript_utility_functions.h"
+
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
 #include "core/os/thread.h"
@@ -38,7 +40,6 @@
 #include "core/templates/pair.h"
 #include "core/templates/self_list.h"
 #include "core/variant/variant.h"
-#include "gdscript_utility_functions.h"
 
 class GDScriptInstance;
 class GDScript;

modules/gdscript/gdscript_lambda_callable.cpp

@@ -30,9 +30,10 @@
 
 #include "gdscript_lambda_callable.h"
 
-#include "core/templates/hashfuncs.h"
 #include "gdscript.h"
 
+#include "core/templates/hashfuncs.h"
+
 bool GDScriptLambdaCallable::compare_equal(const CallableCustom *p_a, const CallableCustom *p_b) {
 	// Lambda callables are only compared by reference.
 	return p_a == p_b;

modules/gdscript/gdscript_parser.cpp

@@ -30,23 +30,27 @@
 
 #include "gdscript_parser.h"
 
+#include "gdscript.h"
+
+#ifdef DEBUG_ENABLED
+#include "gdscript_warning.h"
+#endif
+
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_defs.h"
-#include "gdscript.h"
 #include "scene/main/multiplayer_api.h"
 
 #ifdef DEBUG_ENABLED
 #include "core/os/os.h"
 #include "core/string/string_builder.h"
-#include "gdscript_warning.h"
 #include "servers/text_server.h"
-#endif // DEBUG_ENABLED
+#endif
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"
-#endif // TOOLS_ENABLED
+#endif
 
 static HashMap<StringName, Variant::Type> builtin_types;
 Variant::Type GDScriptParser::get_builtin_type(const StringName &p_type) {

modules/gdscript/gdscript_parser.h

@@ -31,6 +31,13 @@
 #ifndef GDSCRIPT_PARSER_H
 #define GDSCRIPT_PARSER_H
 
+#include "gdscript_cache.h"
+#include "gdscript_tokenizer.h"
+
+#ifdef DEBUG_ENABLED
+#include "gdscript_warning.h"
+#endif
+
 #include "core/io/resource.h"
 #include "core/object/ref_counted.h"
 #include "core/object/script_language.h"
@@ -41,13 +48,10 @@
 #include "core/templates/rb_map.h"
 #include "core/templates/vector.h"
 #include "core/variant/variant.h"
-#include "gdscript_cache.h"
-#include "gdscript_tokenizer.h"
 
 #ifdef DEBUG_ENABLED
 #include "core/string/string_builder.h"
-#include "gdscript_warning.h"
-#endif // DEBUG_ENABLED
+#endif
 
 class GDScriptParser {
 	struct AnnotationInfo;

modules/gdscript/gdscript_tokenizer.cpp

@@ -33,13 +33,14 @@
 #include "core/error/error_macros.h"
 #include "core/string/char_utils.h"
 
-#ifdef TOOLS_ENABLED
-#include "editor/editor_settings.h"
-#endif
 #ifdef DEBUG_ENABLED
 #include "servers/text_server.h"
 #endif
 
+#ifdef TOOLS_ENABLED
+#include "editor/editor_settings.h"
+#endif
+
 static const char *token_names[] = {
 	"Empty", // EMPTY,
 	// Basic

modules/gdscript/gdscript_utility_functions.cpp

@@ -30,6 +30,8 @@
 
 #include "gdscript_utility_functions.h"
 
+#include "gdscript.h"
+
 #include "core/io/resource_loader.h"
 #include "core/object/class_db.h"
 #include "core/object/method_bind.h"
@@ -37,7 +39,6 @@
 #include "core/templates/oa_hash_map.h"
 #include "core/templates/vector.h"
 #include "core/variant/typed_array.h"
-#include "gdscript.h"
 
 #ifdef DEBUG_ENABLED
 

modules/gdscript/gdscript_vm.cpp

@@ -28,12 +28,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#include "gdscript.h"
 #include "gdscript_function.h"
+#include "gdscript_lambda_callable.h"
 
 #include "core/core_string_names.h"
 #include "core/os/os.h"
-#include "gdscript.h"
-#include "gdscript_lambda_callable.h"
 
 #ifdef DEBUG_ENABLED
 static String _get_script_name(const Ref<Script> p_script) {

modules/gdscript/language_server/gdscript_extend_parser.h

@@ -32,9 +32,10 @@
 #define GDSCRIPT_EXTEND_PARSER_H
 
 #include "../gdscript_parser.h"
-#include "core/variant/variant.h"
 #include "godot_lsp.h"
 
+#include "core/variant/variant.h"
+
 #ifndef LINE_NUMBER_TO_INDEX
 #define LINE_NUMBER_TO_INDEX(p_line) ((p_line)-1)
 #endif

modules/gdscript/language_server/gdscript_language_protocol.h

@@ -31,13 +31,14 @@
 #ifndef GDSCRIPT_LANGUAGE_PROTOCOL_H
 #define GDSCRIPT_LANGUAGE_PROTOCOL_H
 
-#include "core/io/stream_peer.h"
-#include "core/io/stream_peer_tcp.h"
-#include "core/io/tcp_server.h"
 #include "gdscript_text_document.h"
 #include "gdscript_workspace.h"
 #include "godot_lsp.h"
 
+#include "core/io/stream_peer.h"
+#include "core/io/stream_peer_tcp.h"
+#include "core/io/tcp_server.h"
+
 #include "modules/modules_enabled.gen.h" // For jsonrpc.
 #ifdef MODULE_JSONRPC_ENABLED
 #include "modules/jsonrpc/jsonrpc.h"

modules/gdscript/language_server/gdscript_language_server.h

@@ -32,9 +32,10 @@
 #define GDSCRIPT_LANGUAGE_SERVER_H
 
 #include "../gdscript_parser.h"
-#include "editor/editor_plugin.h"
 #include "gdscript_language_protocol.h"
 
+#include "editor/editor_plugin.h"
+
 class GDScriptLanguageServer : public EditorPlugin {
 	GDCLASS(GDScriptLanguageServer, EditorPlugin);
 

modules/gdscript/language_server/gdscript_text_document.cpp

@@ -31,11 +31,12 @@
 #include "gdscript_text_document.h"
 
 #include "../gdscript.h"
+#include "gdscript_extend_parser.h"
+#include "gdscript_language_protocol.h"
+
 #include "core/os/os.h"
 #include "editor/editor_settings.h"
 #include "editor/plugins/script_text_editor.h"
-#include "gdscript_extend_parser.h"
-#include "gdscript_language_protocol.h"
 #include "servers/display_server.h"
 
 void GDScriptTextDocument::_bind_methods() {

modules/gdscript/language_server/gdscript_text_document.h

@@ -31,9 +31,10 @@
 #ifndef GDSCRIPT_TEXT_DOCUMENT_H
 #define GDSCRIPT_TEXT_DOCUMENT_H
 
+#include "godot_lsp.h"
+
 #include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
-#include "godot_lsp.h"
 
 class GDScriptTextDocument : public RefCounted {
 	GDCLASS(GDScriptTextDocument, RefCounted)

modules/gdscript/language_server/gdscript_workspace.cpp

@@ -32,6 +32,8 @@
 
 #include "../gdscript.h"
 #include "../gdscript_parser.h"
+#include "gdscript_language_protocol.h"
+
 #include "core/config/project_settings.h"
 #include "core/object/script_language.h"
 #include "editor/doc_tools.h"
@@ -39,7 +41,6 @@
 #include "editor/editor_help.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
-#include "gdscript_language_protocol.h"
 #include "scene/resources/packed_scene.h"
 
 void GDScriptWorkspace::_bind_methods() {

modules/gdscript/language_server/gdscript_workspace.h

@@ -32,11 +32,12 @@
 #define GDSCRIPT_WORKSPACE_H
 
 #include "../gdscript_parser.h"
-#include "core/variant/variant.h"
-#include "editor/editor_file_system.h"
 #include "gdscript_extend_parser.h"
 #include "godot_lsp.h"
 
+#include "core/variant/variant.h"
+#include "editor/editor_file_system.h"
+
 class GDScriptWorkspace : public RefCounted {
 	GDCLASS(GDScriptWorkspace, RefCounted);
 

modules/gdscript/register_types.cpp

@@ -30,39 +30,51 @@
 
 #include "register_types.h"
 
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/io/file_access_encrypted.h"
-#include "core/io/resource_loader.h"
 #include "gdscript.h"
 #include "gdscript_analyzer.h"
 #include "gdscript_cache.h"
 #include "gdscript_tokenizer.h"
 #include "gdscript_utility_functions.h"
 
+#ifdef TOOLS_ENABLED
+#include "editor/gdscript_highlighter.h"
+#include "editor/gdscript_translation_parser_plugin.h"
+
+#ifndef GDSCRIPT_NO_LSP
+#include "language_server/gdscript_language_server.h"
+#endif
+#endif // TOOLS_ENABLED
+
 #ifdef TESTS_ENABLED
 #include "tests/test_gdscript.h"
-#include "tests/test_macros.h"
 #endif
 
-GDScriptLanguage *script_language_gd = nullptr;
-Ref<ResourceFormatLoaderGDScript> resource_loader_gd;
-Ref<ResourceFormatSaverGDScript> resource_saver_gd;
-GDScriptCache *gdscript_cache = nullptr;
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/io/file_access_encrypted.h"
+#include "core/io/resource_loader.h"
 
 #ifdef TOOLS_ENABLED
-
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/editor_translation_parser.h"
 #include "editor/export/editor_export.h"
-#include "editor/gdscript_highlighter.h"
-#include "editor/gdscript_translation_parser_plugin.h"
 
 #ifndef GDSCRIPT_NO_LSP
 #include "core/config/engine.h"
-#include "language_server/gdscript_language_server.h"
-#endif // !GDSCRIPT_NO_LSP
+#endif
+#endif // TOOLS_ENABLED
+
+#ifdef TESTS_ENABLED
+#include "tests/test_macros.h"
+#endif
+
+GDScriptLanguage *script_language_gd = nullptr;
+Ref<ResourceFormatLoaderGDScript> resource_loader_gd;
+Ref<ResourceFormatSaverGDScript> resource_saver_gd;
+GDScriptCache *gdscript_cache = nullptr;
+
+#ifdef TOOLS_ENABLED
 
 Ref<GDScriptEditorTranslationParserPlugin> gdscript_translation_parser_plugin;
 

modules/gdscript/tests/gdscript_test_runner.h

@@ -32,6 +32,7 @@
 #define GDSCRIPT_TEST_RUNNER_H
 
 #include "../gdscript.h"
+
 #include "core/error/error_macros.h"
 #include "core/string/print_string.h"
 #include "core/string/ustring.h"

modules/gdscript/tests/gdscript_test_runner_suite.h

@@ -32,6 +32,7 @@
 #define GDSCRIPT_TEST_RUNNER_SUITE_H
 
 #include "gdscript_test_runner.h"
+
 #include "tests/test_macros.h"
 
 namespace GDScriptTests {

modules/gdscript/tests/test_gdscript.cpp

@@ -30,6 +30,11 @@
 
 #include "test_gdscript.h"
 
+#include "../gdscript_analyzer.h"
+#include "../gdscript_compiler.h"
+#include "../gdscript_parser.h"
+#include "../gdscript_tokenizer.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"
 #include "core/io/file_access_pack.h"
@@ -38,11 +43,6 @@
 #include "core/string/string_builder.h"
 #include "scene/resources/packed_scene.h"
 
-#include "modules/gdscript/gdscript_analyzer.h"
-#include "modules/gdscript/gdscript_compiler.h"
-#include "modules/gdscript/gdscript_parser.h"
-#include "modules/gdscript/gdscript_tokenizer.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"
 #endif

modules/gdscript/tests/test_gdscript.h

@@ -32,6 +32,7 @@
 #define TEST_GDSCRIPT_H
 
 #include "gdscript_test_runner.h"
+
 #include "tests/test_macros.h"
 
 namespace GDScriptTests {

modules/glslang/register_types.cpp

@@ -30,10 +30,10 @@
 
 #include "register_types.h"
 
-#include "servers/rendering/rendering_device.h"
-
 #include "glslang_resource_limits.h"
 
+#include "servers/rendering/rendering_device.h"
+
 #include <glslang/Include/Types.h>
 #include <glslang/Public/ShaderLang.h>
 #include <glslang/SPIRV/GlslangToSpv.h>

modules/gltf/editor/editor_scene_exporter_gltf_plugin.cpp

@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifdef TOOLS_ENABLED
-
 #include "editor_scene_exporter_gltf_plugin.h"
 
+#ifdef TOOLS_ENABLED
+
 #include "../gltf_document.h"
 
 #include "editor/editor_file_system.h"

modules/gltf/editor/editor_scene_exporter_gltf_plugin.h

@@ -33,9 +33,10 @@
 
 #ifdef TOOLS_ENABLED
 
-#include "editor/editor_plugin.h"
 #include "editor_scene_importer_gltf.h"
 
+#include "editor/editor_plugin.h"
+
 class EditorFileDialog;
 
 class SceneExporterGLTFPlugin : public EditorPlugin {

modules/gltf/editor/editor_scene_importer_gltf.cpp

@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifdef TOOLS_ENABLED
-
 #include "editor_scene_importer_gltf.h"
 
+#ifdef TOOLS_ENABLED
+
 #include "../gltf_defines.h"
 #include "../gltf_document.h"
 

modules/gltf/extensions/physics/gltf_collider.cpp

@@ -31,6 +31,7 @@
 #include "gltf_collider.h"
 
 #include "../../gltf_state.h"
+
 #include "core/math/convex_hull.h"
 #include "scene/3d/area_3d.h"
 #include "scene/resources/box_shape_3d.h"

modules/gltf/extensions/physics/gltf_collider.h

@@ -32,6 +32,7 @@
 #define GLTF_COLLIDER_H
 
 #include "../../gltf_defines.h"
+
 #include "scene/3d/collision_shape_3d.h"
 
 class ImporterMesh;

modules/gltf/extensions/physics/gltf_document_extension_physics.h

@@ -32,7 +32,6 @@
 #define GLTF_DOCUMENT_EXTENSION_PHYSICS_H
 
 #include "../gltf_document_extension.h"
-
 #include "gltf_collider.h"
 #include "gltf_physics_body.h"
 

modules/gltf/register_types.cpp

@@ -37,13 +37,14 @@
 #include "gltf_document.h"
 
 #ifdef TOOLS_ENABLED
-#include "core/config/project_settings.h"
 #include "editor/editor_import_blend_runner.h"
-#include "editor/editor_node.h"
 #include "editor/editor_scene_exporter_gltf_plugin.h"
 #include "editor/editor_scene_importer_blend.h"
 #include "editor/editor_scene_importer_fbx.h"
 #include "editor/editor_scene_importer_gltf.h"
+
+#include "core/config/project_settings.h"
+#include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 
 static void _editor_init() {

modules/gltf/structures/gltf_accessor.h

@@ -32,6 +32,7 @@
 #define GLTF_ACCESSOR_H
 
 #include "../gltf_defines.h"
+
 #include "core/io/resource.h"
 
 struct GLTFAccessor : public Resource {

modules/gltf/structures/gltf_buffer_view.h

@@ -32,6 +32,7 @@
 #define GLTF_BUFFER_VIEW_H
 
 #include "../gltf_defines.h"
+
 #include "core/io/resource.h"
 
 class GLTFBufferView : public Resource {

modules/gltf/structures/gltf_mesh.h

@@ -32,6 +32,7 @@
 #define GLTF_MESH_H
 
 #include "../gltf_defines.h"
+
 #include "scene/resources/importer_mesh.h"
 
 class GLTFMesh : public Resource {

modules/gltf/structures/gltf_node.h

@@ -32,6 +32,7 @@
 #define GLTF_NODE_H
 
 #include "../gltf_defines.h"
+
 #include "core/io/resource.h"
 
 class GLTFNode : public Resource {

modules/gltf/structures/gltf_skeleton.cpp

@@ -31,6 +31,7 @@
 #include "gltf_skeleton.h"
 
 #include "../gltf_template_convert.h"
+
 #include "scene/3d/bone_attachment_3d.h"
 
 void GLTFSkeleton::_bind_methods() {

modules/gltf/structures/gltf_skeleton.h

@@ -32,6 +32,7 @@
 #define GLTF_SKELETON_H
 
 #include "../gltf_defines.h"
+
 #include "core/io/resource.h"
 
 class GLTFSkeleton : public Resource {

modules/gltf/structures/gltf_skin.cpp

@@ -31,6 +31,7 @@
 #include "gltf_skin.h"
 
 #include "../gltf_template_convert.h"
+
 #include "core/variant/typed_array.h"
 #include "scene/resources/skin.h"
 

modules/gltf/structures/gltf_skin.h

@@ -32,6 +32,7 @@
 #define GLTF_SKIN_H
 
 #include "../gltf_defines.h"
+
 #include "core/io/resource.h"
 
 template <typename T>

modules/gltf/structures/gltf_texture.h

@@ -32,6 +32,7 @@
 #define GLTF_TEXTURE_H
 
 #include "../gltf_defines.h"
+
 #include "core/io/resource.h"
 
 class GLTFTexture : public Resource {

modules/gridmap/editor/grid_map_editor_plugin.h

@@ -34,6 +34,7 @@
 #ifdef TOOLS_ENABLED
 
 #include "../grid_map.h"
+
 #include "editor/editor_plugin.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/item_list.h"

modules/gridmap/register_types.cpp

@@ -32,13 +32,14 @@
 
 #include "register_types.h"
 
-#include "core/object/class_db.h"
 #include "grid_map.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/grid_map_editor_plugin.h"
 #endif
 
+#include "core/object/class_db.h"
+
 void initialize_gridmap_module(ModuleInitializationLevel p_level) {
 	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
 		GDREGISTER_CLASS(GridMap);

modules/jpg/image_loader_jpegd.cpp

@@ -35,6 +35,7 @@
 
 #include <jpgd.h>
 #include <jpge.h>
+
 #include <string.h>
 
 Error jpeg_load_image_from_buffer(Image *p_image, const uint8_t *p_buffer, int p_buffer_len) {

modules/jsonrpc/register_types.cpp

@@ -29,9 +29,11 @@
 /**************************************************************************/
 
 #include "register_types.h"
-#include "core/object/class_db.h"
+
 #include "jsonrpc.h"
 
+#include "core/object/class_db.h"
+
 void initialize_jsonrpc_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;

modules/lightmapper_rd/lightmapper_rd.cpp

@@ -30,11 +30,12 @@
 
 #include "lightmapper_rd.h"
 
-#include "core/config/project_settings.h"
-#include "core/math/geometry_2d.h"
 #include "lm_blendseams.glsl.gen.h"
 #include "lm_compute.glsl.gen.h"
 #include "lm_raster.glsl.gen.h"
+
+#include "core/config/project_settings.h"
+#include "core/math/geometry_2d.h"
 #include "servers/rendering/rendering_device_binds.h"
 
 //uncomment this if you want to see textures from all the process saved

modules/lightmapper_rd/register_types.cpp

@@ -30,8 +30,9 @@
 
 #include "register_types.h"
 
-#include "core/config/project_settings.h"
 #include "lightmapper_rd.h"
+
+#include "core/config/project_settings.h"
 #include "scene/3d/lightmapper.h"
 
 #ifndef _3D_DISABLED

modules/mbedtls/crypto_mbedtls.cpp

@@ -30,25 +30,25 @@
 
 #include "crypto_mbedtls.h"
 
-#include "core/io/file_access.h"
-
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/certs_compressed.gen.h"
 #include "core/io/compression.h"
+#include "core/io/file_access.h"
 #include "core/os/os.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/editor_settings.h"
 #endif
-#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n"
-#define PEM_END_CRT "-----END CERTIFICATE-----\n"
-#define PEM_MIN_SIZE 54
 
 #include <mbedtls/debug.h>
 #include <mbedtls/md.h>
 #include <mbedtls/pem.h>
 
+#define PEM_BEGIN_CRT "-----BEGIN CERTIFICATE-----\n"
+#define PEM_END_CRT "-----END CERTIFICATE-----\n"
+#define PEM_MIN_SIZE 54
+
 CryptoKey *CryptoKeyMbedTLS::create() {
 	return memnew(CryptoKeyMbedTLS);
 }

modules/mbedtls/dtls_server_mbedtls.cpp

@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "dtls_server_mbedtls.h"
+
 #include "packet_peer_mbed_dtls.h"
 
 Error DTLSServerMbedTLS::setup(Ref<TLSOptions> p_options) {

modules/mbedtls/dtls_server_mbedtls.h

@@ -31,9 +31,10 @@
 #ifndef DTLS_SERVER_MBEDTLS_H
 #define DTLS_SERVER_MBEDTLS_H
 
-#include "core/io/dtls_server.h"
 #include "tls_context_mbedtls.h"
 
+#include "core/io/dtls_server.h"
+
 class DTLSServerMbedTLS : public DTLSServer {
 private:
 	static DTLSServer *_create_func();

modules/mbedtls/packet_peer_mbed_dtls.h

@@ -31,9 +31,10 @@
 #ifndef PACKET_PEER_MBED_DTLS_H
 #define PACKET_PEER_MBED_DTLS_H
 
-#include "core/io/packet_peer_dtls.h"
 #include "tls_context_mbedtls.h"
 
+#include "core/io/packet_peer_dtls.h"
+
 #include <mbedtls/timing.h>
 
 class PacketPeerMbedDTLS : public PacketPeerDTLS {

modules/mbedtls/stream_peer_mbedtls.h

@@ -31,9 +31,10 @@
 #ifndef STREAM_PEER_MBEDTLS_H
 #define STREAM_PEER_MBEDTLS_H
 
-#include "core/io/stream_peer_tls.h"
 #include "tls_context_mbedtls.h"
 
+#include "core/io/stream_peer_tls.h"
+
 class StreamPeerMbedTLS : public StreamPeerTLS {
 private:
 	Status status = STATUS_DISCONNECTED;

modules/mbedtls/tests/test_crypto_mbedtls.cpp

@@ -30,7 +30,8 @@
 
 #include "test_crypto_mbedtls.h"
 
-#include "modules/mbedtls/crypto_mbedtls.h"
+#include "../crypto_mbedtls.h"
+
 #include "tests/test_macros.h"
 
 namespace TestCryptoMbedTLS {

modules/mbedtls/tls_context_mbedtls.h

@@ -34,7 +34,6 @@
 #include "crypto_mbedtls.h"
 
 #include "core/io/file_access.h"
-
 #include "core/object/ref_counted.h"
 
 #include <mbedtls/config.h>

modules/meshoptimizer/register_types.cpp

@@ -29,7 +29,9 @@
 /**************************************************************************/
 
 #include "register_types.h"
+
 #include "scene/resources/surface_tool.h"
+
 #include "thirdparty/meshoptimizer/meshoptimizer.h"
 
 void initialize_meshoptimizer_module(ModuleInitializationLevel p_level) {

modules/minimp3/audio_stream_mp3.cpp

@@ -32,7 +32,6 @@
 #define MINIMP3_FLOAT_OUTPUT
 #define MINIMP3_IMPLEMENTATION
 #define MINIMP3_NO_STDIO
-
 #include "audio_stream_mp3.h"
 
 #include "core/io/file_access.h"

modules/minimp3/audio_stream_mp3.h

@@ -34,7 +34,7 @@
 #include "core/io/resource_loader.h"
 #include "servers/audio/audio_stream.h"
 
-#include "minimp3_ex.h"
+#include <minimp3_ex.h>
 
 class AudioStreamMP3;
 

modules/minimp3/register_types.cpp

@@ -33,10 +33,13 @@
 #include "audio_stream_mp3.h"
 
 #ifdef TOOLS_ENABLED
-#include "core/config/engine.h"
 #include "resource_importer_mp3.h"
 #endif
 
+#ifdef TOOLS_ENABLED
+#include "core/config/engine.h"
+#endif
+
 void initialize_minimp3_module(ModuleInitializationLevel p_level) {
 	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
 		return;

modules/minimp3/resource_importer_mp3.h

@@ -32,6 +32,7 @@
 #define RESOURCE_IMPORTER_MP3_H
 
 #include "audio_stream_mp3.h"
+
 #include "core/io/resource_importer.h"
 
 class ResourceImporterMP3 : public ResourceImporter {

modules/mono/csharp_script.cpp

@@ -30,7 +30,23 @@
 
 #include "csharp_script.h"
 
-#include <stdint.h>
+#include "godotsharp_dirs.h"
+#include "managed_callable.h"
+#include "mono_gd/gd_mono_cache.h"
+#include "signal_awaiter_utils.h"
+#include "utils/macros.h"
+#include "utils/naming_utils.h"
+#include "utils/path_utils.h"
+#include "utils/string_utils.h"
+
+#ifdef DEBUG_METHODS_ENABLED
+#include "class_db_api_json.h"
+#endif
+
+#ifdef TOOLS_ENABLED
+#include "editor/editor_internal_calls.h"
+#include "editor/script_templates/templates.gen.h"
+#endif
 
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
@@ -39,31 +55,18 @@
 #include "core/os/mutex.h"
 #include "core/os/os.h"
 #include "core/os/thread.h"
+#include "servers/text_server.h"
 
 #ifdef TOOLS_ENABLED
 #include "core/os/keyboard.h"
 #include "editor/editor_file_system.h"
-#include "editor/editor_internal_calls.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "editor/inspector_dock.h"
 #include "editor/node_dock.h"
-#include "editor/script_templates/templates.gen.h"
 #endif
 
-#ifdef DEBUG_METHODS_ENABLED
-#include "class_db_api_json.h"
-#endif
-
-#include "godotsharp_dirs.h"
-#include "managed_callable.h"
-#include "mono_gd/gd_mono_cache.h"
-#include "servers/text_server.h"
-#include "signal_awaiter_utils.h"
-#include "utils/macros.h"
-#include "utils/naming_utils.h"
-#include "utils/path_utils.h"
-#include "utils/string_utils.h"
+#include <stdint.h>
 
 #define CACHED_STRING_NAME(m_var) (CSharpLanguage::get_singleton()->get_string_names().m_var)
 

modules/mono/csharp_script.h

@@ -31,15 +31,15 @@
 #ifndef CSHARP_SCRIPT_H
 #define CSHARP_SCRIPT_H
 
+#include "mono_gc_handle.h"
+#include "mono_gd/gd_mono.h"
+
 #include "core/doc_data.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/object/script_language.h"
 #include "core/templates/self_list.h"
 
-#include "mono_gc_handle.h"
-#include "mono_gd/gd_mono.h"
-
 #ifdef TOOLS_ENABLED
 #include "editor/editor_plugin.h"
 #endif

modules/mono/editor/bindings_generator.cpp

@@ -32,6 +32,11 @@
 
 #if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
 
+#include "../godotsharp_defs.h"
+#include "../utils/naming_utils.h"
+#include "../utils/path_utils.h"
+#include "../utils/string_utils.h"
+
 #include "core/config/engine.h"
 #include "core/core_constants.h"
 #include "core/io/compression.h"
@@ -40,11 +45,6 @@
 #include "core/os/os.h"
 #include "main/main.h"
 
-#include "../godotsharp_defs.h"
-#include "../utils/naming_utils.h"
-#include "../utils/path_utils.h"
-#include "../utils/string_utils.h"
-
 StringBuilder &operator<<(StringBuilder &r_sb, const String &p_string) {
 	r_sb.append(p_string);
 	return r_sb;

modules/mono/editor/bindings_generator.h

@@ -31,16 +31,17 @@
 #ifndef BINDINGS_GENERATOR_H
 #define BINDINGS_GENERATOR_H
 
+#include "core/typedefs.h" // DEBUG_METHODS_ENABLED
+
+#if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
+
 #include "core/doc_data.h"
 #include "core/object/class_db.h"
 #include "core/string/string_builder.h"
+#include "core/string/ustring.h"
 #include "editor/doc_tools.h"
 #include "editor/editor_help.h"
 
-#if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED)
-
-#include "core/string/ustring.h"
-
 class BindingsGenerator {
 	struct ConstantInterface {
 		String name;

modules/mono/editor/editor_internal_calls.cpp

@@ -30,9 +30,12 @@
 
 #include "editor_internal_calls.h"
 
-#ifdef UNIX_ENABLED
-#include <unistd.h> // access
-#endif
+#include "../csharp_script.h"
+#include "../godotsharp_dirs.h"
+#include "../interop_types.h"
+#include "../utils/macos_utils.h"
+#include "../utils/path_utils.h"
+#include "code_completion.h"
 
 #include "core/config/project_settings.h"
 #include "core/os/os.h"
@@ -46,13 +49,9 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "main/main.h"
 
-#include "../csharp_script.h"
-#include "../godotsharp_dirs.h"
-#include "../utils/macos_utils.h"
-#include "../utils/path_utils.h"
-#include "code_completion.h"
-
-#include "../interop_types.h"
+#ifdef UNIX_ENABLED
+#include <unistd.h> // access
+#endif
 
 #ifdef __cplusplus
 extern "C" {

modules/mono/editor/hostfxr_resolver.cpp

@@ -60,6 +60,9 @@ SOFTWARE.
 
 #include "hostfxr_resolver.h"
 
+#include "../utils/path_utils.h"
+#include "semver.h"
+
 #include "core/config/engine.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
@@ -70,9 +73,6 @@ SOFTWARE.
 #include <windows.h>
 #endif
 
-#include "../utils/path_utils.h"
-#include "semver.h"
-
 // We don't use libnethost as it gives us issues with some compilers.
 // This file tries to mimic libnethost's hostfxr_resolver search logic. We try to use the
 // same function names for easier comparing in case we need to update this in the future.

modules/mono/glue/runtime_interop.cpp

@@ -30,6 +30,13 @@
 
 #include "runtime_interop.h"
 
+#include "../csharp_script.h"
+#include "../interop_types.h"
+#include "../managed_callable.h"
+#include "../mono_gd/gd_mono_cache.h"
+#include "../signal_awaiter_utils.h"
+#include "../utils/path_utils.h"
+
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
@@ -44,14 +51,6 @@
 #include "editor/editor_file_system.h"
 #endif
 
-#include "../interop_types.h"
-
-#include "modules/mono/csharp_script.h"
-#include "modules/mono/managed_callable.h"
-#include "modules/mono/mono_gd/gd_mono_cache.h"
-#include "modules/mono/signal_awaiter_utils.h"
-#include "modules/mono/utils/path_utils.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

modules/mono/godotsharp_dirs.cpp

@@ -30,6 +30,13 @@
 
 #include "godotsharp_dirs.h"
 
+#include "mono_gd/gd_mono.h"
+#include "utils/path_utils.h"
+
+#ifdef ANDROID_ENABLED
+#include "mono_gd/support/android_support.h"
+#endif
+
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/os/os.h"
@@ -39,13 +46,6 @@
 #include "editor/editor_paths.h"
 #endif
 
-#ifdef ANDROID_ENABLED
-#include "mono_gd/support/android_support.h"
-#endif
-
-#include "mono_gd/gd_mono.h"
-#include "utils/path_utils.h"
-
 namespace GodotSharpDirs {
 
 String _get_expected_build_config() {

modules/mono/managed_callable.h

@@ -31,12 +31,12 @@
 #ifndef MANAGED_CALLABLE_H
 #define MANAGED_CALLABLE_H
 
+#include "mono_gc_handle.h"
+
 #include "core/os/mutex.h"
 #include "core/templates/self_list.h"
 #include "core/variant/callable.h"
 
-#include "mono_gc_handle.h"
-
 class ManagedCallable : public CallableCustom {
 	friend class CSharpLanguage;
 	GCHandleIntPtr delegate_handle;

modules/mono/mono_gd/gd_mono.cpp

@@ -30,26 +30,25 @@
 
 #include "gd_mono.h"
 
-#include "core/config/project_settings.h"
-#include "core/debugger/engine_debugger.h"
-#include "core/io/dir_access.h"
-#include "core/io/file_access.h"
-#include "core/os/os.h"
-#include "core/os/thread.h"
-
 #include "../csharp_script.h"
 #include "../glue/runtime_interop.h"
 #include "../godotsharp_dirs.h"
-#include "../utils/path_utils.h"
-#include "gd_mono_cache.h"
-
 #include "../thirdparty/coreclr_delegates.h"
 #include "../thirdparty/hostfxr.h"
+#include "../utils/path_utils.h"
+#include "gd_mono_cache.h"
 
 #ifdef TOOLS_ENABLED
 #include "../editor/hostfxr_resolver.h"
 #endif
 
+#include "core/config/project_settings.h"
+#include "core/debugger/engine_debugger.h"
+#include "core/io/dir_access.h"
+#include "core/io/file_access.h"
+#include "core/os/os.h"
+#include "core/os/thread.h"
+
 #ifdef UNIX_ENABLED
 #include <dlfcn.h>
 #endif

modules/mono/mono_gd/gd_mono.h

@@ -31,10 +31,10 @@
 #ifndef GD_MONO_H
 #define GD_MONO_H
 
-#include "core/io/config_file.h"
-
 #include "../godotsharp_defs.h"
 
+#include "core/io/config_file.h"
+
 #ifndef GD_CLR_STDCALL
 #ifdef WIN32
 #define GD_CLR_STDCALL __stdcall

modules/mono/mono_gd/gd_mono_cache.h

@@ -31,11 +31,10 @@
 #ifndef GD_MONO_CACHE_H
 #define GD_MONO_CACHE_H
 
-#include <stdint.h>
-
 #include "../csharp_script.h"
 #include "../interop_types.h"
 #include "../mono_gc_handle.h"
+
 #include "core/object/object.h"
 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
@@ -43,6 +42,8 @@
 #include "core/variant/dictionary.h"
 #include "core/variant/variant.h"
 
+#include <stdint.h>
+
 class CSharpScript;
 
 namespace GDMonoCache {

modules/mono/mono_gd/support/android_support.cpp

@@ -32,8 +32,21 @@
 
 #if defined(ANDROID_ENABLED)
 
-#include <dlfcn.h> // dlopen, dlsym
+#include "../../utils/path_utils.h"
+#include "../../utils/string_utils.h"
+#include "../gd_mono_cache.h"
+#include "../gd_mono_marshal.h"
+
+#include "core/os/os.h"
+#include "core/string/ustring.h"
+
+#include "java_godot_wrapper.h"
+#include "os_android.h"
+#include "thread_jandroid.h"
+
 #include <mono/utils/mono-dl-fallback.h>
+
+#include <dlfcn.h> // dlopen, dlsym
 #include <sys/system_properties.h>
 #include <cstddef>
 
@@ -43,17 +56,6 @@
 #include <ifaddrs.h>
 #endif
 
-#include "core/os/os.h"
-#include "core/string/ustring.h"
-#include "platform/android/java_godot_wrapper.h"
-#include "platform/android/os_android.h"
-#include "platform/android/thread_jandroid.h"
-
-#include "../../utils/path_utils.h"
-#include "../../utils/string_utils.h"
-#include "../gd_mono_cache.h"
-#include "../gd_mono_marshal.h"
-
 // Warning: JNI boilerplate ahead... continue at your own risk
 
 namespace gdmono {

modules/mono/mono_gd/support/ios_support.mm

@@ -32,12 +32,12 @@
 
 #if defined(IOS_ENABLED)
 
-#import <Foundation/Foundation.h>
-#include <os/log.h>
+#include "../gd_mono_marshal.h"
 
 #include "core/ustring.h"
 
-#include "../gd_mono_marshal.h"
+#import <Foundation/Foundation.h>
+#include <os/log.h>
 
 // Implemented mostly following: https://github.com/mono/mono/blob/master/sdks/ios/app/runtime.m
 

modules/mono/register_types.cpp

@@ -30,10 +30,10 @@
 
 #include "register_types.h"
 
-#include "core/config/engine.h"
-
 #include "csharp_script.h"
 
+#include "core/config/engine.h"
+
 CSharpLanguage *script_language_cs = nullptr;
 Ref<ResourceFormatLoaderCSharpScript> resource_loader_cs;
 Ref<ResourceFormatSaverCSharpScript> resource_saver_cs;

modules/mono/signal_awaiter_utils.h

@@ -31,11 +31,11 @@
 #ifndef SIGNAL_AWAITER_UTILS_H
 #define SIGNAL_AWAITER_UTILS_H
 
-#include "core/object/ref_counted.h"
-
 #include "csharp_script.h"
 #include "mono_gc_handle.h"
 
+#include "core/object/ref_counted.h"
+
 Error gd_mono_connect_signal_awaiter(Object *p_source, const StringName &p_signal, Object *p_target, GCHandleIntPtr p_awaiter_handle_ptr);
 
 class BaseSignalCallable : public CallableCustom {