Cleanup of the messaging interface.

1 files changed, 2 insertions, 22 deletions

diff --git a/src/core/netclient.h b/src/core/netclient.h
index cca9529..f52aae6 100644
--- a/src/core/netclient.h
+++ b/src/core/netclient.h
@@ -7,32 +7,12 @@
 #ifndef __INCLUDED_CORE_NETCLIENT_H__
 #define __INCLUDED_CORE_NETCLIENT_H__
 
-#include "core/net.h"
-
-#include <unistd.h>
-#include <errno.h>
-
-#ifndef _WIN32
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-#endif
-
-#include <string>
-#include <deque>
-#include <map>
-
 namespace core
 {
 class NetClient;
 }
 
-#include "core/netplayer.h"
+#include "core/net.h"
 
 namespace core
 {
@@ -96,7 +76,7 @@ private:
 	int			client_fd;
 	bool 			client_error;
 
-	NetPlayer		*client_player;
+	Player			*client_player;
 
 	std::string		messageblock;
 	std::deque<std::string>	recvq;