2 files changed, 4 insertions, 7 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;