1 files changed, 4 insertions, 9 deletions

diff --git a/src/core/internal_network/socket_proxy.h b/src/core/internal_network/socket_proxy.h
index ad917cac3..f12b5f567 100644
--- a/src/core/internal_network/socket_proxy.h
+++ b/src/core/internal_network/socket_proxy.h
@@ -7,6 +7,7 @@
 #include <vector>
 #include <queue>
 
+#include "common/common_funcs.h"
 #include "core/internal_network/sockets.h"
 #include "network/network.h"
 
@@ -14,17 +15,12 @@ namespace Network {
 
 class ProxySocket : public SocketBase {
 public:
+    YUZU_NON_COPYABLE(ProxySocket);
+    YUZU_NON_MOVEABLE(ProxySocket);
+
     explicit ProxySocket(RoomNetwork& room_network_) noexcept;
     ~ProxySocket() override;
 
-    ProxySocket(const ProxySocket&) = delete;
-    ProxySocket& operator=(const ProxySocket&) = delete;
-
-    ProxySocket(ProxySocket&& rhs) noexcept;
-
-    // Avoid closing sockets implicitly
-    ProxySocket& operator=(ProxySocket&&) noexcept = delete;
-
     void HandleProxyPacket(const ProxyPacket& packet) override;
 
     Errno Initialize(Domain domain, Type type, Protocol socket_protocol) override;
@@ -87,7 +83,6 @@ private:
     bool closed = false;
     u32 send_timeout = 0;
     u32 receive_timeout = 0;
-    std::map<int, const char*> socket_options;
     bool is_bound = false;
     SockAddrIn local_endpoint{};
     bool blocking = true;