* Use a proper namespace.

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

1 files changed, 11 insertions, 2 deletions

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 37fde29ca..59e71daa0 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -1,7 +1,10 @@
-#include "globals.hh"
 #include "gc.hh"
+#include "globals.hh"
 #include "misc.hh"
 #include "pathlocks.hh"
+#include "store.hh"
+#include "db.hh"
+#include "util.hh"
 
 #include <boost/shared_ptr.hpp>
 
@@ -17,6 +20,9 @@
 #endif
 
 
+namespace nix {
+
+
 static string gcLockName = "gc.lock";
 static string tempRootsDir = "temproots";
 static string gcRootsDir = "gcroots";
@@ -192,7 +198,7 @@ void removeTempRoots()
 }
 
 
-typedef shared_ptr<AutoCloseFD> FDPtr;
+typedef boost::shared_ptr<AutoCloseFD> FDPtr;
 typedef list<FDPtr> FDs;
 
 
@@ -558,3 +564,6 @@ void collectGarbage(GCAction action, const PathSet & pathsToDelete,
         }
     }
 }
+
+ 
+}