--- a/src/proto2/NetworkTCP.hh	Tue Nov 18 22:58:50 2008 +0000
+++ b/src/proto2/NetworkTCP.hh	Thu Nov 20 19:25:56 2008 +0000
@@ -3,13 +3,16 @@
 
 #include "NetworkSocket.hh"
 #include "NetworkAddress.hh"
+#include "NetworkPacket.hh"
+#include "Error.hh"
 
 const size_t NETWORK_TCP_CHUNK_SIZE = 1024;
 const size_t NETWORK_TCP_INITIAL_IN_BUF = 4096;
 const size_t NETWORK_TCP_INITIAL_OUT_BUF = 0;
 
-class NetworkDisconnectError : public exception {
-
+class NetworkDisconnectError : public Error {
+    public:
+        NetworkDisconnectError (const std::string &message) : Error(message) { }
 };
 
 class NetworkBuffer {
@@ -21,11 +24,11 @@
     
     public:
         NetworkBuffer (NetworkSocket &socket, size_t size_hint);
- 
+    
     private:
-        NetworkBuffer (const NetworkBuffer &copy) { };
+        NetworkBuffer (const NetworkBuffer &copy);
         ~NetworkBuffer (void);
-        NetworkBuffer& operator= (const NetworkBuffer &copy) { };
+        NetworkBuffer& operator= (const NetworkBuffer &copy);
 
         void resize (size_t suffix_size);
         void trim (size_t prefix_size);
@@ -58,7 +61,7 @@
         void on_write (void);
         void on_disconnected (void);
 
-        CL_Signal_v1<const NetworkPacket&> _sig_packet;
+        CL_Signal_v1<const NetworkPacket &> _sig_packet;
         CL_Signal_v0 _sig_disconnect;
 
     public: