diff --git a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
index d05e64300dc97a3c19600dccf1180a6a9b671f3b..b85395a1d58f5d4a385e13c908e696063a342082 100644
--- a/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
+++ b/VistaCoreLibs/VistaInterProcComm/IPNet/VistaSocket.cpp
@@ -51,7 +51,6 @@
 	#include <time.h>
 #endif
 #include <iostream>
-using namespace std;
 
 #include <cerrno>     // errno
 #include <cstring>
@@ -62,7 +61,7 @@ using namespace std;
 /* MACROS AND DEFINES                                                         */
 /*============================================================================*/
 
-bool IVistaSocket::PrintErrorMessage(const string &sMethodName)
+bool IVistaSocket::PrintErrorMessage(const std::string &sMethodName)
 {
 	std::string sErrorMessage;
 	#ifdef WIN32
@@ -671,7 +670,7 @@ int  IVistaSocket::ReceiveRaw(void *pvBuffer, const int iLength, int iTimeout, i
 		if(PrintErrorMessage("ReceiveRaw") == false)
 		{
 			// it's a real error and _not_ WOULDBLOCK
-			if(GetSocketTypeString() != string("UDP"))
+			if(GetSocketTypeString() != std::string("UDP"))
 			{
 				// we have a real error on a tcp socket
 				SetErrorState(true);