* Use a proper namespace.

* Optimise header file usage a bit.
* Compile the parser as C++.

3 files changed, 26 insertions, 4 deletions

diff --git a/src/nix-store/dotgraph.cc b/src/nix-store/dotgraph.cc
index 053358e3ad..4b068514e4 100644
--- a/src/nix-store/dotgraph.cc
+++ b/src/nix-store/dotgraph.cc
@@ -1,7 +1,14 @@
+#include "dotgraph.hh"
+#include "util.hh"
+#include "store.hh"
+#include "db.hh"
+
 #include <iostream>
 
-#include "dotgraph.hh"
-#include "build.hh"
+
+using std::cout;
+
+namespace nix {
 
 
 static string dotQuote(const string & s)
@@ -151,3 +158,6 @@ void printDotGraph(const PathSet & roots)
 
     cout << "}\n";
 }
+
+ 
+}
diff --git a/src/nix-store/dotgraph.hh b/src/nix-store/dotgraph.hh
index 9effa5a884..2318e2fde4 100644
--- a/src/nix-store/dotgraph.hh
+++ b/src/nix-store/dotgraph.hh
@@ -1,8 +1,12 @@
 #ifndef __DOTGRAPH_H
 #define __DOTGRAPH_H
 
-#include "util.hh"
+#include "types.hh"
+
+namespace nix {
 
 void printDotGraph(const PathSet & roots);
 
+}
+
 #endif /* !__DOTGRAPH_H */
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index fc458a246c..616cb83106 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -8,9 +8,17 @@
 #include "archive.hh"
 #include "shared.hh"
 #include "dotgraph.hh"
+#include "store.hh"
+#include "db.hh"
+#include "util.hh"
 #include "help.txt.hh"
 
 
+using namespace nix;
+using std::cin;
+using std::cout;
+
+
 typedef void (* Operation) (Strings opFlags, Strings opArgs);
 
 
@@ -528,7 +536,7 @@ static void opGC(Strings opFlags, Strings opArgs)
 
     if (action != gcDeleteDead) {
         for (PathSet::iterator i = result.begin(); i != result.end(); ++i)
-            cout << *i << endl;
+            cout << *i << std::endl;
     }
 }