* Use a proper namespace.

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

src/libstore/pathlocks.cc

@@ -1,17 +1,21 @@
+#include "pathlocks.hh"
+#include "util.hh"
+
 #include <cerrno>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "pathlocks.hh"
-
 #ifdef __CYGWIN__
 #include <windows.h>
 #include <sys/cygwin.h>
 #endif
 
 
+namespace nix {
+
+
 int openLockFile(const Path & path, bool create)
 {
     AutoCloseFD fd;
@@ -220,3 +224,6 @@ void PathLocks::setDeletion(bool deletePaths)
 {
     this->deletePaths = deletePaths;
 }
+
+ 
+}