8 files changed, 25 insertions, 21 deletions
diff --git a/modules/websocket/editor/editor_debugger_server_websocket.cpp b/modules/websocket/editor/editor_debugger_server_websocket.cpp
index 35fc051bc3..a28fc53440 100644
--- a/modules/websocket/editor/editor_debugger_server_websocket.cpp
+++ b/modules/websocket/editor/editor_debugger_server_websocket.cpp
@@ -33,6 +33,7 @@
 #ifdef TOOLS_ENABLED
 
 #include "../remote_debugger_peer_websocket.h"
+
 #include "core/config/project_settings.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"
diff --git a/modules/websocket/emws_peer.cpp b/modules/websocket/emws_peer.cpp
index 7b14a3a61d..329e5bd532 100644
--- a/modules/websocket/emws_peer.cpp
+++ b/modules/websocket/emws_peer.cpp
@@ -28,10 +28,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifdef WEB_ENABLED
-
 #include "emws_peer.h"
 
+#ifdef WEB_ENABLED
+
 #include "core/io/ip.h"
 
 void EMWSPeer::_esws_on_connect(void *p_obj, char *p_proto) {
diff --git a/modules/websocket/emws_peer.h b/modules/websocket/emws_peer.h
index 08b2dad977..38f15c82e5 100644
--- a/modules/websocket/emws_peer.h
+++ b/modules/websocket/emws_peer.h
@@ -33,12 +33,14 @@
 
 #ifdef WEB_ENABLED
 
+#include "packet_buffer.h"
+#include "websocket_peer.h"
+
 #include "core/error/error_list.h"
 #include "core/io/packet_peer.h"
 #include "core/templates/ring_buffer.h"
-#include "emscripten.h"
-#include "packet_buffer.h"
-#include "websocket_peer.h"
+
+#include <emscripten.h>
 
 extern "C" {
 typedef void (*WSOnOpen)(void *p_ref, char *p_protocol);
diff --git a/modules/websocket/register_types.cpp b/modules/websocket/register_types.cpp
index 08935626d0..c57210c8c9 100644
--- a/modules/websocket/register_types.cpp
+++ b/modules/websocket/register_types.cpp
@@ -30,15 +30,10 @@
 
 #include "register_types.h"
 
-#include "core/config/project_settings.h"
-#include "core/debugger/engine_debugger.h"
-#include "core/error/error_macros.h"
-
+#include "remote_debugger_peer_websocket.h"
 #include "websocket_multiplayer_peer.h"
 #include "websocket_peer.h"
 
-#include "remote_debugger_peer_websocket.h"
-
 #ifdef WEB_ENABLED
 #include "emws_peer.h"
 #else
@@ -46,8 +41,15 @@
 #endif
 
 #ifdef TOOLS_ENABLED
-#include "editor/debugger/editor_debugger_server.h"
 #include "editor/editor_debugger_server_websocket.h"
+#endif
+
+#include "core/config/project_settings.h"
+#include "core/debugger/engine_debugger.h"
+#include "core/error/error_macros.h"
+
+#ifdef TOOLS_ENABLED
+#include "editor/debugger/editor_debugger_server.h"
 #include "editor/editor_node.h"
 #endif
 
diff --git a/modules/websocket/remote_debugger_peer_websocket.h b/modules/websocket/remote_debugger_peer_websocket.h
index 5d26e076c7..50d0d28203 100644
--- a/modules/websocket/remote_debugger_peer_websocket.h
+++ b/modules/websocket/remote_debugger_peer_websocket.h
@@ -31,10 +31,10 @@
 #ifndef REMOTE_DEBUGGER_PEER_WEBSOCKET_H
 #define REMOTE_DEBUGGER_PEER_WEBSOCKET_H
 
-#include "core/debugger/remote_debugger_peer.h"
-
 #include "websocket_peer.h"
 
+#include "core/debugger/remote_debugger_peer.h"
+
 class RemoteDebuggerPeerWebSocket : public RemoteDebuggerPeer {
 	Ref<WebSocketPeer> ws_peer;
 	List<Array> in_queue;
diff --git a/modules/websocket/websocket_multiplayer_peer.h b/modules/websocket/websocket_multiplayer_peer.h
index 22f1bc939b..f793cb375e 100644
--- a/modules/websocket/websocket_multiplayer_peer.h
+++ b/modules/websocket/websocket_multiplayer_peer.h
@@ -31,12 +31,13 @@
 #ifndef WEBSOCKET_MULTIPLAYER_PEER_H
 #define WEBSOCKET_MULTIPLAYER_PEER_H
 
+#include "websocket_peer.h"
+
 #include "core/error/error_list.h"
 #include "core/io/stream_peer_tls.h"
 #include "core/io/tcp_server.h"
 #include "core/templates/list.h"
 #include "scene/main/multiplayer_peer.h"
-#include "websocket_peer.h"
 
 class WebSocketMultiplayerPeer : public MultiplayerPeer {
 	GDCLASS(WebSocketMultiplayerPeer, MultiplayerPeer);
diff --git a/modules/websocket/wsl_peer.cpp b/modules/websocket/wsl_peer.cpp
index 109d5102c3..a127a6b75a 100644
--- a/modules/websocket/wsl_peer.cpp
+++ b/modules/websocket/wsl_peer.cpp
@@ -28,11 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/
 
-#ifndef WEB_ENABLED
-
 #include "wsl_peer.h"
 
-#include "wsl_peer.h"
+#ifndef WEB_ENABLED
 
 #include "core/io/stream_peer_tls.h"
 
diff --git a/modules/websocket/wsl_peer.h b/modules/websocket/wsl_peer.h
index c06e768b6d..bf9f5c8527 100644
--- a/modules/websocket/wsl_peer.h
+++ b/modules/websocket/wsl_peer.h
@@ -33,16 +33,16 @@
 
 #ifndef WEB_ENABLED
 
-#include "websocket_peer.h"
-
 #include "packet_buffer.h"
+#include "websocket_peer.h"
 
 #include "core/crypto/crypto_core.h"
 #include "core/error/error_list.h"
 #include "core/io/packet_peer.h"
 #include "core/io/stream_peer_tcp.h"
 #include "core/templates/ring_buffer.h"
-#include "wslay/wslay.h"
+
+#include <wslay/wslay.h>
 
 #define WSL_MAX_HEADER_SIZE 4096