* Use a proper namespace.

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

src/libmain/shared.hh

@@ -1,9 +1,7 @@
 #ifndef __SHARED_H
 #define __SHARED_H
 
-#include <string>
-
-#include "util.hh"
+#include "types.hh"
 
 
 /* These are not implemented here, but must be implemented by a
@@ -12,17 +10,21 @@
 /* Main program.  Called by main() after the ATerm library has been
    initialised and some default arguments have been processed (and
    removed from `args').  main() will catch all exceptions. */
-void run(Strings args);
+void run(nix::Strings args);
 
 /* Should print a help message to stdout and return. */
 void printHelp();
 
+extern std::string programId;
+
+
+namespace nix {
+
 /* Ugh.  No better place to put this. */
 Path makeRootName(const Path & gcRoot, int & counter);
 void printGCWarning();
 
-
-extern string programId;
+}
 
 
 #endif /* !__SHARED_H */