diff --git a/meson.build b/meson.build
index 0f1eaaf7..626b750e 100644
--- a/meson.build
+++ b/meson.build
@@ -73,18 +73,18 @@ poseidon_include = [
   'poseidon/easy/easy_udp_server.hpp',
   'poseidon/easy/easy_udp_client.hpp',
   'poseidon/easy/easy_tcp_server.hpp',
-  'poseidon/easy/easy_tcp_client.hpp',
-  'poseidon/easy/easy_ssl_server.hpp',
-  'poseidon/easy/easy_ssl_client.hpp',
   'poseidon/easy/easy_http_server.hpp',
-  'poseidon/easy/easy_http_client.hpp',
-  'poseidon/easy/easy_https_server.hpp',
-  'poseidon/easy/easy_https_client.hpp',
-  'poseidon/easy/easy_ws_server.hpp',
   'poseidon/easy/easy_hws_server.hpp',
-  'poseidon/easy/easy_ws_client.hpp',
-  'poseidon/easy/easy_wss_server.hpp',
+  'poseidon/easy/easy_ws_server.hpp',
+  'poseidon/easy/easy_ssl_server.hpp',
+  'poseidon/easy/easy_https_server.hpp',
   'poseidon/easy/easy_hwss_server.hpp',
+  'poseidon/easy/easy_wss_server.hpp',
+  'poseidon/easy/easy_tcp_client.hpp',
+  'poseidon/easy/easy_http_client.hpp',
+  'poseidon/easy/easy_ws_client.hpp',
+  'poseidon/easy/easy_ssl_client.hpp',
+  'poseidon/easy/easy_https_client.hpp',
   'poseidon/easy/easy_wss_client.hpp',
 ]
 
@@ -166,18 +166,18 @@ poseidon_src = [
   'poseidon/easy/easy_udp_server.cpp',
   'poseidon/easy/easy_udp_client.cpp',
   'poseidon/easy/easy_tcp_server.cpp',
-  'poseidon/easy/easy_tcp_client.cpp',
-  'poseidon/easy/easy_ssl_server.cpp',
-  'poseidon/easy/easy_ssl_client.cpp',
   'poseidon/easy/easy_http_server.cpp',
-  'poseidon/easy/easy_http_client.cpp',
-  'poseidon/easy/easy_https_server.cpp',
-  'poseidon/easy/easy_https_client.cpp',
-  'poseidon/easy/easy_ws_server.cpp',
   'poseidon/easy/easy_hws_server.cpp',
-  'poseidon/easy/easy_ws_client.cpp',
-  'poseidon/easy/easy_wss_server.cpp',
+  'poseidon/easy/easy_ws_server.cpp',
+  'poseidon/easy/easy_ssl_server.cpp',
+  'poseidon/easy/easy_https_server.cpp',
   'poseidon/easy/easy_hwss_server.cpp',
+  'poseidon/easy/easy_wss_server.cpp',
+  'poseidon/easy/easy_tcp_client.cpp',
+  'poseidon/easy/easy_http_client.cpp',
+  'poseidon/easy/easy_ws_client.cpp',
+  'poseidon/easy/easy_ssl_client.cpp',
+  'poseidon/easy/easy_https_client.cpp',
   'poseidon/easy/easy_wss_client.cpp',
 ]
 
diff --git a/poseidon/fwd.hpp b/poseidon/fwd.hpp
index 656720ed..c2a2eb2f 100644
--- a/poseidon/fwd.hpp
+++ b/poseidon/fwd.hpp
@@ -435,24 +435,24 @@ class Redis_Connection;
 // async/await operations. These are suitable for agile development.
 enum Easy_Stream_Event : uint8_t;  // TCP, SSL
 enum Easy_HTTP_Event : uint8_t;  // HTTP, HTTPS
-enum Easy_WS_Event : uint8_t;  // WS, WSS
 enum Easy_HWS_Event : uint8_t;  // HTTP+WS, HTTPS+WSS
+enum Easy_WS_Event : uint8_t;  // WS, WSS
 class Easy_Timer;
 class Easy_UDP_Server;
 class Easy_UDP_Client;
 class Easy_TCP_Server;
-class Easy_TCP_Client;
-class Easy_SSL_Server;
-class Easy_SSL_Client;
 class Easy_HTTP_Server;
-class Easy_HTTP_Client;
-class Easy_HTTPS_Server;
-class Easy_HTTPS_Client;
-class Easy_WS_Server;
 class Easy_HWS_Server;
-class Easy_WS_Client;
-class Easy_WSS_Server;
+class Easy_WS_Server;
+class Easy_SSL_Server;
+class Easy_HTTPS_Server;
 class Easy_HWSS_Server;
+class Easy_WSS_Server;
+class Easy_TCP_Client;
+class Easy_HTTP_Client;
+class Easy_WS_Client;
+class Easy_SSL_Client;
+class Easy_HTTPS_Client;
 class Easy_WSS_Client;
 
 // Singletons