1 files changed, 7 insertions, 9 deletions
diff --git a/src/include/dkimbase.h b/src/include/dkimbase.h
index ddded67..320deb9 100644
--- a/src/include/dkimbase.h
+++ b/src/include/dkimbase.h
@@ -22,17 +22,15 @@
 #ifndef DKIMBASE_H
 #define DKIMBASE_H
 
+#include <list>
+#include <string>
+
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
 #define BUFFER_ALLOC_INCREMENT 256
 
-#include <list>
-#include <string>
-
-using namespace std;
-
 class CDKIMBase {
 public:
   CDKIMBase();
@@ -49,12 +47,12 @@ public:
 
   static void RemoveSWSP(char *szBuffer);
   static void RemoveSWSP(char *pBuffer, int& nBufLength);
-  static void RemoveSWSP(string& sBuffer);
+  static void RemoveSWSP(std::string& sBuffer);
 
   static void CompressSWSP(char *pBuffer, int& nBufLength);
-  static void CompressSWSP(string& sBuffer);
+  static void CompressSWSP(std::string& sBuffer);
 
-  static string RelaxHeader(const string& sHeader);
+  static std::string RelaxHeader(const std::string& sHeader);
 
   virtual int ProcessHeaders(void);
   virtual int ProcessBody(char *szBuffer, int nBufLength, bool bEOF);
@@ -70,7 +68,7 @@ protected:
   int m_LinePos;
   bool m_InHeaders;
 
-  list<string> HeaderList;
+  std::list<std::string> HeaderList;
 };