From fc195519b5dfbb8e7901cf6672fb4af36df9b350 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Tue, 5 Sep 2006 08:54:48 +0000
Subject: [PATCH] * Sone missing #includes.

---
 src/aterm-helper.pl    | 1 +
 src/libexpr/nixexpr.cc | 1 +
 src/nix-store/main.cc  | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/aterm-helper.pl b/src/aterm-helper.pl
index 54eb33abd..5b7b33691 100755
--- a/src/aterm-helper.pl
+++ b/src/aterm-helper.pl
@@ -40,6 +40,7 @@ my $initFun = "init";
 open HEADER, ">$ARGV[0]";
 open IMPL, ">$ARGV[1]";
 
+print HEADER "#include <aterm2.h>\n";
 print HEADER "#ifdef __cplusplus\n";
 print HEADER "namespace nix {\n";
 print HEADER "#endif\n\n\n";
diff --git a/src/libexpr/nixexpr.cc b/src/libexpr/nixexpr.cc
index b7ccb656c..9622a0328 100644
--- a/src/libexpr/nixexpr.cc
+++ b/src/libexpr/nixexpr.cc
@@ -1,6 +1,7 @@
 #include "nixexpr.hh"
 #include "derivations.hh"
 #include "util.hh"
+#include "aterm.hh"
 
 #include "nixexpr-ast.hh"
 #include "nixexpr-ast.cc"
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 616cb8310..42c3074ff 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -503,7 +503,7 @@ struct PrintFreed
     bool show, dryRun;
     unsigned long long bytesFreed;
     PrintFreed(bool show, bool dryRun)
-        : bytesFreed(0), show(show), dryRun(dryRun) { }
+        : show(show), dryRun(dryRun), bytesFreed(0) { }
     ~PrintFreed() 
     {
         if (show)