16 files changed, 53 insertions, 29 deletions
diff --git a/platform/web/api/api.cpp b/platform/web/api/api.cpp
index a630e3d866..ab7154b0fb 100644
--- a/platform/web/api/api.cpp
+++ b/platform/web/api/api.cpp
@@ -29,10 +29,12 @@
 /**************************************************************************/
 
 #include "api.h"
-#include "core/config/engine.h"
+
 #include "javascript_bridge_singleton.h"
 #include "web_tools_editor_plugin.h"
 
+#include "core/config/engine.h"
+
 static JavaScriptBridge *javascript_bridge_singleton;
 
 void register_web_api() {
@@ -78,6 +80,7 @@ void JavaScriptBridge::_bind_methods() {
 }
 
 #if !defined(WEB_ENABLED) || !defined(JAVASCRIPT_EVAL_ENABLED)
+
 Variant JavaScriptBridge::eval(const String &p_code, bool p_use_global_exec_context) {
 	return Variant();
 }
@@ -104,16 +107,23 @@ Variant JavaScriptBridge::_create_object_bind(const Variant **p_args, int p_argc
 	}
 	return Ref<JavaScriptObject>();
 }
+
 #endif
+
 #if !defined(WEB_ENABLED)
+
 bool JavaScriptBridge::pwa_needs_update() const {
 	return false;
 }
+
 Error JavaScriptBridge::pwa_update() {
 	return ERR_UNAVAILABLE;
 }
+
 void JavaScriptBridge::force_fs_sync() {
 }
+
 void JavaScriptBridge::download_buffer(Vector<uint8_t> p_arr, const String &p_name, const String &p_mime) {
 }
+
 #endif
diff --git a/platform/web/api/web_tools_editor_plugin.cpp b/platform/web/api/web_tools_editor_plugin.cpp
index 213204ff33..d39773bde2 100644
--- a/platform/web/api/web_tools_editor_plugin.cpp
+++ b/platform/web/api/web_tools_editor_plugin.cpp
@@ -28,9 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#if defined(TOOLS_ENABLED) && defined(WEB_ENABLED)
 #include "web_tools_editor_plugin.h"
 
+#if defined(TOOLS_ENABLED) && defined(WEB_ENABLED)
+
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
@@ -154,4 +155,5 @@ void WebToolsEditorPlugin::_zip_recursive(String p_path, String p_base_path, zip
 		cur = dir->get_next();
 	}
 }
-#endif
+
+#endif // TOOLS_ENABLED && WEB_ENABLED
diff --git a/platform/web/api/web_tools_editor_plugin.h b/platform/web/api/web_tools_editor_plugin.h
index fc74899a58..ac0d5e20ec 100644
--- a/platform/web/api/web_tools_editor_plugin.h
+++ b/platform/web/api/web_tools_editor_plugin.h
@@ -32,6 +32,7 @@
 #define WEB_TOOLS_EDITOR_PLUGIN_H
 
 #if defined(TOOLS_ENABLED) && defined(WEB_ENABLED)
+
 #include "core/io/zip_io.h"
 #include "editor/editor_plugin.h"
 
@@ -48,11 +49,14 @@ public:
 
 	WebToolsEditorPlugin();
 };
+
 #else
+
 class WebToolsEditorPlugin {
 public:
 	static void initialize() {}
 };
-#endif
+
+#endif // TOOLS_ENABLED && WEB_ENABLED
 
 #endif // WEB_TOOLS_EDITOR_PLUGIN_H
diff --git a/platform/web/audio_driver_web.h b/platform/web/audio_driver_web.h
index be13935bd9..7bfed834e1 100644
--- a/platform/web/audio_driver_web.h
+++ b/platform/web/audio_driver_web.h
@@ -31,12 +31,12 @@
 #ifndef AUDIO_DRIVER_WEB_H
 #define AUDIO_DRIVER_WEB_H
 
+#include "godot_audio.h"
+
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
 #include "servers/audio_server.h"
 
-#include "godot_audio.h"
-
 class AudioDriverWeb : public AudioDriver {
 private:
 	struct AudioContext {
diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp
index e870f0da29..6cb56b404f 100644
--- a/platform/web/display_server_web.cpp
+++ b/platform/web/display_server_web.cpp
@@ -30,19 +30,20 @@
 
 #include "display_server_web.h"
 
+#include "dom_keys.inc"
+#include "godot_js.h"
+#include "os_web.h"
+
 #include "core/config/project_settings.h"
+#include "servers/rendering/dummy/rasterizer_dummy.h"
+
 #ifdef GLES3_ENABLED
 #include "drivers/gles3/rasterizer_gles3.h"
 #endif
-#include "platform/web/os_web.h"
-#include "servers/rendering/dummy/rasterizer_dummy.h"
 
 #include <emscripten.h>
 #include <png.h>
 
-#include "dom_keys.inc"
-#include "godot_js.h"
-
 #define DOM_BUTTON_LEFT 0
 #define DOM_BUTTON_MIDDLE 1
 #define DOM_BUTTON_RIGHT 2
diff --git a/platform/web/export/export.cpp b/platform/web/export/export.cpp
index 80c29024a8..168310c078 100644
--- a/platform/web/export/export.cpp
+++ b/platform/web/export/export.cpp
@@ -30,9 +30,10 @@
 
 #include "export.h"
 
+#include "export_plugin.h"
+
 #include "editor/editor_settings.h"
 #include "editor/export/editor_export.h"
-#include "export_plugin.h"
 
 void register_web_exporter_types() {
 	GDREGISTER_VIRTUAL_CLASS(EditorExportPlatformWeb);
diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp
index 2fff628c85..a398593f90 100644
--- a/platform/web/export/export_plugin.cpp
+++ b/platform/web/export/export_plugin.cpp
@@ -30,12 +30,13 @@
 
 #include "export_plugin.h"
 
+#include "../logo_svg.gen.h"
+#include "../run_icon_svg.gen.h"
+
 #include "core/config/project_settings.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "editor/export/editor_export.h"
-#include "platform/web/logo_svg.gen.h"
-#include "platform/web/run_icon_svg.gen.h"
 
 #include "modules/modules_enabled.gen.h" // For svg.
 #ifdef MODULE_SVG_ENABLED
diff --git a/platform/web/export/export_plugin.h b/platform/web/export/export_plugin.h
index 334f12d64d..a1d3fed2f3 100644
--- a/platform/web/export/export_plugin.h
+++ b/platform/web/export/export_plugin.h
@@ -31,6 +31,8 @@
 #ifndef WEB_EXPORT_PLUGIN_H
 #define WEB_EXPORT_PLUGIN_H
 
+#include "editor_http_server.h"
+
 #include "core/config/project_settings.h"
 #include "core/io/image_loader.h"
 #include "core/io/stream_peer_tls.h"
@@ -38,7 +40,6 @@
 #include "core/io/zip_io.h"
 #include "editor/editor_node.h"
 #include "editor/export/editor_export_platform.h"
-#include "editor_http_server.h"
 #include "main/splash.gen.h"
 
 class EditorExportPlatformWeb : public EditorExportPlatform {
diff --git a/platform/web/godot_audio.h b/platform/web/godot_audio.h
index c6f92161fa..a32d5acd97 100644
--- a/platform/web/godot_audio.h
+++ b/platform/web/godot_audio.h
@@ -35,7 +35,8 @@
 extern "C" {
 #endif
 
-#include "stddef.h"
+#include <stddef.h>
+#include <stdint.h>
 
 extern int godot_audio_is_available();
 extern int godot_audio_has_worklet();
diff --git a/platform/web/godot_js.h b/platform/web/godot_js.h
index 660822e291..3341cf8a67 100644
--- a/platform/web/godot_js.h
+++ b/platform/web/godot_js.h
@@ -35,7 +35,7 @@
 extern "C" {
 #endif
 
-#include "stddef.h"
+#include <stddef.h>
 
 // Config
 extern void godot_js_config_locale_get(char *p_ptr, int p_ptr_max);
diff --git a/platform/web/godot_webgl2.h b/platform/web/godot_webgl2.h
index fd551ff77d..d2f46e125e 100644
--- a/platform/web/godot_webgl2.h
+++ b/platform/web/godot_webgl2.h
@@ -31,8 +31,8 @@
 #ifndef GODOT_WEBGL2_H
 #define GODOT_WEBGL2_H
 
-#include "GLES3/gl3.h"
-#include "webgl/webgl2.h"
+#include <GLES3/gl3.h>
+#include <webgl/webgl2.h>
 
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_NUM_VIEWS_OVR 0x9630
 #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_BASE_VIEW_INDEX_OVR 0x9632
diff --git a/platform/web/http_client_web.h b/platform/web/http_client_web.h
index def7837a27..bb9672ab82 100644
--- a/platform/web/http_client_web.h
+++ b/platform/web/http_client_web.h
@@ -37,7 +37,7 @@
 extern "C" {
 #endif
 
-#include "stddef.h"
+#include <stddef.h>
 
 typedef enum {
 	GODOT_JS_FETCH_STATE_REQUESTING = 0,
diff --git a/platform/web/javascript_bridge_singleton.cpp b/platform/web/javascript_bridge_singleton.cpp
index dba630404f..45bce1b480 100644
--- a/platform/web/javascript_bridge_singleton.cpp
+++ b/platform/web/javascript_bridge_singleton.cpp
@@ -30,9 +30,10 @@
 
 #include "api/javascript_bridge_singleton.h"
 
-#include "emscripten.h"
 #include "os_web.h"
 
+#include <emscripten.h>
+
 extern "C" {
 extern void godot_js_os_download_buffer(const uint8_t *p_buf, int p_buf_size, const char *p_name, const char *p_mime);
 }
@@ -352,6 +353,7 @@ Variant JavaScriptBridge::eval(const String &p_code, bool p_use_global_exec_cont
 			return Variant();
 	}
 }
+
 #endif // JAVASCRIPT_EVAL_ENABLED
 
 void JavaScriptBridge::download_buffer(Vector<uint8_t> p_arr, const String &p_name, const String &p_mime) {
diff --git a/platform/web/os_web.cpp b/platform/web/os_web.cpp
index 0f84e7e841..5115ff50da 100644
--- a/platform/web/os_web.cpp
+++ b/platform/web/os_web.cpp
@@ -30,12 +30,15 @@
 
 #include "os_web.h"
 
+#include "api/javascript_bridge_singleton.h"
+#include "display_server_web.h"
+#include "godot_js.h"
+
 #include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "drivers/unix/dir_access_unix.h"
 #include "drivers/unix/file_access_unix.h"
 #include "main/main.h"
-#include "platform/web/display_server_web.h"
 
 #include "modules/modules_enabled.gen.h" // For websocket.
 
@@ -43,9 +46,6 @@
 #include <emscripten.h>
 #include <stdlib.h>
 
-#include "api/javascript_bridge_singleton.h"
-#include "godot_js.h"
-
 void OS_Web::alert(const String &p_alert, const String &p_title) {
 	godot_js_display_alert(p_alert.utf8().get_data());
 }
diff --git a/platform/web/os_web.h b/platform/web/os_web.h
index 70d8af9db9..b9570f9ca1 100644
--- a/platform/web/os_web.h
+++ b/platform/web/os_web.h
@@ -32,6 +32,7 @@
 #define OS_WEB_H
 
 #include "audio_driver_web.h"
+
 #include "core/input/input.h"
 #include "drivers/unix/os_unix.h"
 #include "servers/audio_server.h"
diff --git a/platform/web/web_main.cpp b/platform/web/web_main.cpp
index df97b08b8a..f199f8ffd8 100644
--- a/platform/web/web_main.cpp
+++ b/platform/web/web_main.cpp
@@ -28,17 +28,17 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
+#include "display_server_web.h"
+#include "godot_js.h"
+#include "os_web.h"
+
 #include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "main/main.h"
-#include "platform/web/display_server_web.h"
-#include "platform/web/os_web.h"
 
 #include <emscripten/emscripten.h>
 #include <stdlib.h>
 
-#include "godot_js.h"
-
 static OS_Web *os = nullptr;
 static uint64_t target_ticks = 0;
 static bool main_started = false;