diff --git a/include/Nazara/Network/AbstractSocket.hpp b/include/Nazara/Network/AbstractSocket.hpp
index 7b8327cb1..5bd91d807 100644
--- a/include/Nazara/Network/AbstractSocket.hpp
+++ b/include/Nazara/Network/AbstractSocket.hpp
@@ -33,7 +33,7 @@ namespace Nz
 
 			inline bool IsBlockingEnabled() const;
 
-			unsigned int QueryAvailableBytes() const;
+			std::size_t QueryAvailableBytes() const;
 
 			AbstractSocket& operator=(const AbstractSocket&) = delete;
 			AbstractSocket& operator=(AbstractSocket&& abstractSocket);
diff --git a/include/Nazara/Network/UdpSocket.hpp b/include/Nazara/Network/UdpSocket.hpp
index e6577bec7..815f88fc8 100644
--- a/include/Nazara/Network/UdpSocket.hpp
+++ b/include/Nazara/Network/UdpSocket.hpp
@@ -34,7 +34,7 @@ namespace Nz
 
 			inline bool IsBroadcastingEnabled() const;
 
-			unsigned int QueryMaxDatagramSize();
+			std::size_t QueryMaxDatagramSize();
 
 			bool Receive(void* buffer, std::size_t size, IpAddress* from, std::size_t* received);
 
diff --git a/src/Nazara/Network/AbstractSocket.cpp b/src/Nazara/Network/AbstractSocket.cpp
index c24ae43f9..bec0cdf84 100644
--- a/src/Nazara/Network/AbstractSocket.cpp
+++ b/src/Nazara/Network/AbstractSocket.cpp
@@ -63,7 +63,7 @@ namespace Nz
 		}
 	}
 
-	unsigned int AbstractSocket::QueryAvailableBytes() const
+	std::size_t AbstractSocket::QueryAvailableBytes() const
 	{
 		if (m_handle == SocketImpl::InvalidHandle)
 			return 0;
diff --git a/src/Nazara/Network/Posix/SocketImpl.cpp b/src/Nazara/Network/Posix/SocketImpl.cpp
index cf5a638cf..c2cf3a6f8 100644
--- a/src/Nazara/Network/Posix/SocketImpl.cpp
+++ b/src/Nazara/Network/Posix/SocketImpl.cpp
@@ -224,7 +224,7 @@ namespace Nz
 		return code;
 	}
 
-	SocketState SocketImpl::Listen(SocketHandle handle, const IpAddress& address, unsigned queueSize, SocketError* error)
+	SocketState SocketImpl::Listen(SocketHandle handle, const IpAddress& address, unsigned int queueSize, SocketError* error)
 	{
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 		NazaraAssert(address.IsValid(), "Invalid address");
@@ -254,7 +254,7 @@ namespace Nz
 		return SocketState_Bound;
 	}
 
-	unsigned int SocketImpl::QueryAvailableBytes(SocketHandle handle, SocketError* error)
+	std::size_t SocketImpl::QueryAvailableBytes(SocketHandle handle, SocketError* error)
 	{
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 
@@ -311,7 +311,7 @@ namespace Nz
 		return code;
 	}
 
-	unsigned int SocketImpl::QueryMaxDatagramSize(SocketHandle handle, SocketError* error)
+	std::size_t SocketImpl::QueryMaxDatagramSize(SocketHandle handle, SocketError* error)
 	{
 		unsigned int code;
 		unsigned int codeLength = sizeof(code);
diff --git a/src/Nazara/Network/Posix/SocketImpl.hpp b/src/Nazara/Network/Posix/SocketImpl.hpp
index c23b4d3e4..8896ce597 100644
--- a/src/Nazara/Network/Posix/SocketImpl.hpp
+++ b/src/Nazara/Network/Posix/SocketImpl.hpp
@@ -32,12 +32,12 @@ namespace Nz
 			static int GetLastErrorCode();
 			static int GetLastErrorCode(SocketHandle handle, SocketError* error = nullptr);
 
-			static SocketState Listen(SocketHandle handle, const IpAddress& address, unsigned queueSize, SocketError* error);
+			static SocketState Listen(SocketHandle handle, const IpAddress& address, unsigned int queueSize, SocketError* error);
 
-			static unsigned int QueryAvailableBytes(SocketHandle handle, SocketError* error = nullptr);
+			static std::size_t QueryAvailableBytes(SocketHandle handle, SocketError* error = nullptr);
 			static bool QueryBroadcasting(SocketHandle handle, SocketError* error = nullptr);
 			static bool QueryKeepAlive(SocketHandle handle, SocketError* error = nullptr);
-			static unsigned int QueryMaxDatagramSize(SocketHandle handle, SocketError* error = nullptr);
+			static std::size_t QueryMaxDatagramSize(SocketHandle handle, SocketError* error = nullptr);
 			static bool QueryNoDelay(SocketHandle handle, SocketError* error = nullptr);
 			static IpAddress QueryPeerAddress(SocketHandle handle, SocketError* error = nullptr);
 			static IpAddress QuerySocketAddress(SocketHandle handle, SocketError* error = nullptr);
diff --git a/src/Nazara/Network/UdpSocket.cpp b/src/Nazara/Network/UdpSocket.cpp
index 0ecd423bb..88f9f10c0 100644
--- a/src/Nazara/Network/UdpSocket.cpp
+++ b/src/Nazara/Network/UdpSocket.cpp
@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
 #include <Nazara/Network/UdpSocket.hpp>
-#include <Nazara/Network/Debug.hpp>
 
 #if defined(NAZARA_PLATFORM_WINDOWS)
 #include <Nazara/Network/Win32/SocketImpl.hpp>
@@ -13,6 +12,8 @@
 #error Missing implementation: Socket
 #endif
 
+#include <Nazara/Network/Debug.hpp>
+
 namespace Nz
 {
 	SocketState UdpSocket::Bind(const IpAddress& address)
@@ -39,7 +40,7 @@ namespace Nz
 		}
 	}
 
-	unsigned int UdpSocket::QueryMaxDatagramSize()
+	std::size_t UdpSocket::QueryMaxDatagramSize()
 	{
 		NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Socket hasn't been created");
 
diff --git a/src/Nazara/Network/Win32/SocketImpl.cpp b/src/Nazara/Network/Win32/SocketImpl.cpp
index fb788f0e6..1c5ee7ad0 100644
--- a/src/Nazara/Network/Win32/SocketImpl.cpp
+++ b/src/Nazara/Network/Win32/SocketImpl.cpp
@@ -256,7 +256,7 @@ namespace Nz
 		return SocketState_Bound;
 	}
 
-	unsigned int SocketImpl::QueryAvailableBytes(SocketHandle handle, SocketError* error)
+	std::size_t SocketImpl::QueryAvailableBytes(SocketHandle handle, SocketError* error)
 	{
 		NazaraAssert(handle != InvalidHandle, "Invalid handle");
 
diff --git a/src/Nazara/Network/Win32/SocketImpl.hpp b/src/Nazara/Network/Win32/SocketImpl.hpp
index 8f6b1f72d..dc0d77e73 100644
--- a/src/Nazara/Network/Win32/SocketImpl.hpp
+++ b/src/Nazara/Network/Win32/SocketImpl.hpp
@@ -35,10 +35,10 @@ namespace Nz
 
 			static SocketState Listen(SocketHandle handle, const IpAddress& address, unsigned queueSize, SocketError* error);
 
-			static unsigned int QueryAvailableBytes(SocketHandle handle, SocketError* error = nullptr);
+			static std::size_t QueryAvailableBytes(SocketHandle handle, SocketError* error = nullptr);
 			static bool QueryBroadcasting(SocketHandle handle, SocketError* error = nullptr);
 			static bool QueryKeepAlive(SocketHandle handle, SocketError* error = nullptr);
-			static unsigned int QueryMaxDatagramSize(SocketHandle handle, SocketError* error = nullptr);
+			static std::size_t QueryMaxDatagramSize(SocketHandle handle, SocketError* error = nullptr);
 			static bool QueryNoDelay(SocketHandle handle, SocketError* error = nullptr);
 			static IpAddress QueryPeerAddress(SocketHandle handle, SocketError* error = nullptr);
 			static IpAddress QuerySocketAddress(SocketHandle handle, SocketError* error = nullptr);