* Remove unnecessary inclusions of aterm2.h.

7 files changed, 13 insertions, 9 deletions

diff --git a/src/libexpr/nixexpr.hh b/src/libexpr/nixexpr.hh
index af39997c5ec1..69a47a5adcaf 100644
--- a/src/libexpr/nixexpr.hh
+++ b/src/libexpr/nixexpr.hh
@@ -3,8 +3,6 @@
 
 #include <map>
 
-#include <aterm2.h>
-
 #include "aterm-map.hh"
 #include "types.hh"
 
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 1f141c7bb09a..dd4d509a453b 100644
--- a/src/libexpr/parser.y
+++ b/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;
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index d6291cd45ac3..61b3ea89c049 100644
--- a/src/libstore/derivations.cc
+++ b/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"
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index d1c9db50849f..3aa750962e79 100644
--- a/src/libstore/derivations.hh
+++ b/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>
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index 156d059b6f30..bcede901c5ae 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -3,6 +3,8 @@
 #include "build.hh"
 #include "db.hh"
 
+#include <aterm2.h>
+
 
 namespace nix {
 
diff --git a/src/libutil/aterm-map.cc b/src/libutil/aterm-map.cc
index 6c53e07c4605..c31fcdba3966 100644
--- a/src/libutil/aterm-map.cc
+++ b/src/libutil/aterm-map.cc
@@ -5,6 +5,8 @@
 #include <assert.h>
 #include <stdlib.h>
 
+#include <aterm2.h>
+
 
 namespace nix {
 
diff --git a/src/libutil/aterm-map.hh b/src/libutil/aterm-map.hh
index 293df1eb596a..3035b6ec5598 100644
--- a/src/libutil/aterm-map.hh
+++ b/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>