--- a/src/proto2/Network.hh	Wed Nov 05 21:49:53 2008 +0000
+++ b/src/proto2/Network.hh	Wed Nov 05 22:06:31 2008 +0000
@@ -1,9 +1,9 @@
 #ifndef NETWORK_HH
 #define NETWORK_HH
 
-#include <ClanLib/Network/socket.h>
+#include <ClanLib/network.h>
 
-const uint16_t NETWORK_PORT = 9338;
+const std::string NETWORK_PORT_STR = "9338";
 const uint16_t NETWORK_PACKET_MAX = 1280;
 
 class NetworkBase {

--- a/src/proto2/NetworkServer.cc	Wed Nov 05 21:49:53 2008 +0000
+++ b/src/proto2/NetworkServer.cc	Wed Nov 05 22:06:31 2008 +0000
@@ -2,8 +2,6 @@
 
 #include <iostream>
 
-#include <ClanLib/network.h>
-
 NetworkServer::NetworkServer (GameState *state, const CL_IPAddress &listen_ip) : NetworkBase(), state(state) {
 	socket.bind(listen_ip);
 	socket.listen(NETWORK_SERVER_BACKLOG);
@@ -17,7 +15,7 @@
 
 NetworkServer *NetworkServer::newServer (void) {
 	GameState *state = new GameState(/* XXX */);
-	CL_IPAddress listen_ip(NETWORK_PORT);
+	CL_IPAddress listen_ip(NETWORK_PORT_STR);
 	
 	return new NetworkServer(state, listen_ip);
 }