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

1 files changed, 6 insertions, 5 deletions

diff --git a/modules/openxr/openxr_api.cpp b/modules/openxr/openxr_api.cpp
index 5879fbd460..21d9203ead 100644
--- a/modules/openxr/openxr_api.cpp
+++ b/modules/openxr/openxr_api.cpp
@@ -29,6 +29,8 @@
 /**************************************************************************/
 
 #include "openxr_api.h"
+
+#include "openxr_interface.h"
 #include "openxr_util.h"
 
 #include "core/config/engine.h"
@@ -40,10 +42,6 @@
 #include "editor/editor_settings.h"
 #endif
 
-#ifdef ANDROID_ENABLED
-#define OPENXR_LOADER_NAME "libopenxr_loader.so"
-#endif
-
 // We need to have all the graphics API defines before the Vulkan or OpenGL
 // extensions are included, otherwise we'll only get one graphics API.
 #ifdef VULKAN_ENABLED
@@ -65,6 +63,7 @@
 #define GL3_PROTOTYPES 1
 #include "thirdparty/glad/glad/gl.h"
 #include "thirdparty/glad/glad/glx.h"
+
 #include <X11/Xlib.h>
 #endif // X11_ENABLED
 #endif // GLES_ENABLED
@@ -81,7 +80,9 @@
 #include "extensions/openxr_fb_display_refresh_rate_extension.h"
 #include "extensions/openxr_fb_passthrough_extension_wrapper.h"
 
-#include "modules/openxr/openxr_interface.h"
+#ifdef ANDROID_ENABLED
+#define OPENXR_LOADER_NAME "libopenxr_loader.so"
+#endif
 
 OpenXRAPI *OpenXRAPI::singleton = nullptr;
 Vector<OpenXRExtensionWrapper *> OpenXRAPI::registered_extension_wrappers;