diff --git a/src/BloomFilter.cpp b/src/BloomFilter.cpp
index d7cb2b1..2eac978 100644
--- a/src/BloomFilter.cpp
+++ b/src/BloomFilter.cpp
@@ -20,6 +20,8 @@
 #include <fstream>
 #include "BloomFilter.hpp"
 
+using namespace std;
+
 static const size_t BITS_PER_BLOCK = 8;
 
 // Forward declarations
@@ -151,4 +153,4 @@ static vector<BlockType> readVectorFromStream(BinaryInputStream &in) {
 
 size_t BloomFilter::getBitCount() const {
     return bitCount;
-}
\ No newline at end of file
+}
diff --git a/src/BloomFilter.hpp b/src/BloomFilter.hpp
index ee89605..82284f5 100644
--- a/src/BloomFilter.hpp
+++ b/src/BloomFilter.hpp
@@ -17,13 +17,10 @@
 #include <iostream>
 #include <string>
 #include <vector>
-#include <iterator>
-
-using namespace std;
 
 typedef char BlockType;
-typedef basic_istream<BlockType> BinaryInputStream;
-typedef basic_ostream<BlockType> BinaryOutputStream;
+typedef std::basic_istream<BlockType> BinaryInputStream;
+typedef std::basic_ostream<BlockType> BinaryOutputStream;
 
 /*
  Bloom filter with djb2 and sdbm hashing. It is a loose C++ port of
@@ -34,15 +31,15 @@ class BloomFilter {
 public:
     BloomFilter(size_t maxItems, double targetProbability);
 
-    BloomFilter(const string &importFilePath, size_t bitCount, size_t maxItems);
+    BloomFilter(const std::string &importFilePath, size_t bitCount, size_t maxItems);
 
     BloomFilter(BinaryInputStream &in, size_t bitCount, size_t maxItems);
 
-    void add(const string &element);
+    void add(const std::string &element);
 
-    bool contains(const string &element);
+    bool contains(const std::string &element);
 
-    void writeToFile(const string &exportFilePath);
+    void writeToFile(const std::string &exportFilePath);
 
     void writeToStream(BinaryOutputStream &out);
 
@@ -50,6 +47,6 @@ class BloomFilter {
 
 private:
     size_t bitCount;
-    vector<BlockType> bloomVector;
+    std::vector<BlockType> bloomVector;
     size_t hashRounds;
 };