1 files changed, 9 insertions, 7 deletions
diff --git a/src/libstore/db.hh b/src/libstore/db.hh
index 0315728de5..54f490f885 100644
--- a/src/libstore/db.hh
+++ b/src/libstore/db.hh
@@ -1,13 +1,9 @@
 #ifndef __DB_H
 #define __DB_H
 
-#include <string>
-#include <list>
-#include <map>
-
-#include "util.hh"
+#include "types.hh"
 
-using namespace std;
+#include <map>
 
 
 /* Defined externally. */
@@ -16,6 +12,9 @@ class DbEnv;
 class Db;
 
 
+namespace nix {
+
+
 class Database;
 
 
@@ -53,7 +52,7 @@ private:
     DbEnv * env;
 
     TableId nextId;
-    map<TableId, Db *> tables;
+    std::map<TableId, Db *> tables;
 
     void requireEnv();
 
@@ -99,5 +98,8 @@ public:
     DbNoPermission(const format & f) : Error(f) { };
 };
 
+ 
+}
+
 
 #endif /* !__DB_H */