1 files changed, 11 insertions, 4 deletions
diff --git a/src/libutil/aterm.hh b/src/libutil/aterm.hh
index 22364ba011..431c67d130 100644
--- a/src/libutil/aterm.hh
+++ b/src/libutil/aterm.hh
@@ -5,15 +5,15 @@ extern "C" {
 #include <aterm2.h>
 }
 
-#include "util.hh"
+#include "types.hh"
+
+
+namespace nix {
 
 
 /* Print an ATerm. */
 string atPrint(ATerm t);
 
-/* Write an ATerm to an output stream. */
-ostream & operator << (ostream & stream, ATerm e);
-
 class ATermIterator
 {
     ATermList t;
@@ -45,5 +45,12 @@ Error badTerm(const format & f, ATerm t);
 ATerm toATerm(const char * s);
 ATerm toATerm(const string & s);
 
+ 
+}
+
+
+/* Write an ATerm to an output stream. */
+std::ostream & operator << (std::ostream & stream, ATerm e);
+
 
 #endif /* !__ATERM_H */