diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index a356c9a..2339deb 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -40,13 +40,13 @@
 #include <stdlib.h>
 #include <exception>
 
-using std::string;
 
 long int myatoi( const char *str );
 
 class PRNG;
 
 namespace Crypto {
+  using std::string;
 
   class CryptoException : public std::exception {
   public:
diff --git a/src/network/compressor.cc b/src/network/compressor.cc
index d34b7cd..97afd19 100644
--- a/src/network/compressor.cc
+++ b/src/network/compressor.cc
@@ -36,6 +36,7 @@
 #include "dos_assert.h"
 
 using namespace Network;
+using std::string;
 
 string Compressor::compress_str( const string &input )
 {
diff --git a/src/network/transportfragment.h b/src/network/transportfragment.h
index e5559f8..9add05e 100644
--- a/src/network/transportfragment.h
+++ b/src/network/transportfragment.h
@@ -39,11 +39,11 @@
 
 #include "transportinstruction.pb.h"
 
-using std::vector;
-using std::string;
-using namespace TransportBuffers;
-
 namespace Network {
+  using std::vector;
+  using std::string;
+  using namespace TransportBuffers;
+
   class Fragment
   {
   public:
diff --git a/src/network/transportsender.h b/src/network/transportsender.h
index 30d4db7..db55713 100644
--- a/src/network/transportsender.h
+++ b/src/network/transportsender.h
@@ -43,11 +43,11 @@
 #include "transportfragment.h"
 #include "prng.h"
 
-using std::list;
-using std::pair;
-using namespace TransportBuffers;
-
 namespace Network {
+  using std::list;
+  using std::pair;
+  using namespace TransportBuffers;
+
   /* timing parameters */
   const int SEND_INTERVAL_MIN = 20; /* ms between frames */
   const int SEND_INTERVAL_MAX = 250; /* ms between frames */
diff --git a/src/statesync/user.h b/src/statesync/user.h
index fbf2728..67c7853 100644
--- a/src/statesync/user.h
+++ b/src/statesync/user.h
@@ -40,11 +40,11 @@
 
 #include "parseraction.h"
 
-using std::deque;
-using std::list;
-using std::string;
-
 namespace Network {
+  using std::deque;
+  using std::list;
+  using std::string;
+
   enum UserEventType {
     UserByteType = 0,
     ResizeType = 1