diff --git a/wst/trunk/synapse_http_protocol.pas b/wst/trunk/synapse_http_protocol.pas
index 30e9cdb69..f981f06a0 100644
--- a/wst/trunk/synapse_http_protocol.pas
+++ b/wst/trunk/synapse_http_protocol.pas
@@ -19,7 +19,7 @@ interface
 
 uses
   Classes, SysUtils,
-  wst_types, service_intf, imp_utils, base_service_intf, client_utils,
+  service_intf, base_service_intf, client_utils,
   httpsend;
 
 Const
diff --git a/wst/trunk/synapse_tcp_protocol.pas b/wst/trunk/synapse_tcp_protocol.pas
index bdde2d598..74f040ed5 100644
--- a/wst/trunk/synapse_tcp_protocol.pas
+++ b/wst/trunk/synapse_tcp_protocol.pas
@@ -18,7 +18,7 @@ interface
 uses
   Classes, SysUtils,
   service_intf, base_service_intf, client_utils,
-  blcksock;
+  blcksock, synsock;
 
 //{$DEFINE WST_DBG}
 
@@ -57,8 +57,6 @@ Type
   procedure SYNAPSE_RegisterTCP_Transport();
 
 implementation
-uses
-  wst_types;
 
 { TTCPTransport }
 
@@ -66,7 +64,7 @@ procedure TTCPTransport.Connect();
 var
   locReconnect : Boolean;
 begin
-  if ( FConnection.Socket = NOT(0) ) then begin
+  if ( FConnection.Socket = INVALID_SOCKET ) then begin
     FConnection.Connect(Address,Port);
   end else begin
     locReconnect := False;