* Remove unnecessary inclusions of aterm2.h.

src/libexpr/nixexpr.hh

@@ -3,8 +3,6 @@
 
 #include <map>
 
-#include <aterm2.h>
-
 #include "aterm-map.hh"
 #include "types.hh"
 

src/libexpr/parser.y

@@ -11,14 +11,13 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <aterm2.h>
-
-#include "parser-tab.hh"
-#include "lexer-tab.hh"
 
 #include "aterm.hh"
 #include "util.hh"
     
+#include "parser-tab.hh"
+#include "lexer-tab.hh"
+
 #include "nixexpr.hh"
 #include "nixexpr-ast.hh"
 
@@ -38,7 +37,7 @@ struct ParseData
 };
 
 
-static ATerm fixAttrs(int recursive, ATermList as)
+static Expr fixAttrs(int recursive, ATermList as)
 {
     ATermList bs = ATempty, cs = ATempty;
     ATermList * is = recursive ? &cs : &bs;

src/libstore/derivations.cc

@@ -1,5 +1,6 @@
 #include "derivations.hh"
 #include "store.hh"
+#include "aterm.hh"
 
 #include "derivations-ast.hh"
 #include "derivations-ast.cc"

src/libstore/derivations.hh

@@ -1,7 +1,8 @@
 #ifndef __DERIVATIONS_H
 #define __DERIVATIONS_H
 
-#include "aterm.hh"
+typedef struct _ATerm * ATerm;
+
 #include "hash.hh"
 
 #include <map>

src/libstore/misc.cc

@@ -3,6 +3,8 @@
 #include "build.hh"
 #include "db.hh"
 
+#include <aterm2.h>
+
 
 namespace nix {
 

src/libutil/aterm-map.cc

@@ -5,6 +5,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <aterm2.h>
+
 
 namespace nix {
 

src/libutil/aterm-map.hh

@@ -1,7 +1,8 @@
 #ifndef __ATERM_MAP_H
 #define __ATERM_MAP_H
 
-#include <aterm2.h>
+typedef struct _ATerm * ATerm;
+
 #include <assert.h>