* db.hh shouldn't depend on the Berkeley DB headers.

5 files changed, 13 insertions, 3 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 85c89f2c5a..2f6d69d3e1 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1,4 +1,5 @@
 #include <map>
+#include <iostream>
 #include <sstream>
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
@@ -922,7 +923,7 @@ DerivationGoal::HookReply DerivationGoal::tryBuildHook()
                 (worker.canBuildMore() ? (string) "1" : "0").c_str(),
                 thisSystem.c_str(),
                 drv.platform.c_str(),
-                drvPath.c_str(), 0);
+                drvPath.c_str(), NULL);
             
             throw SysError(format("executing `%1%'") % buildHook);
             
diff --git a/src/libstore/db.cc b/src/libstore/db.cc
index 667951ae7b..7f428dc488 100644
--- a/src/libstore/db.cc
+++ b/src/libstore/db.cc
@@ -5,6 +5,8 @@
 
 #include <memory>
 
+#include <db_cxx.h>
+
 #include "db.hh"
 #include "util.hh"
 #include "pathlocks.hh"
diff --git a/src/libstore/db.hh b/src/libstore/db.hh
index dd7d76b8ce..0315728de5 100644
--- a/src/libstore/db.hh
+++ b/src/libstore/db.hh
@@ -5,13 +5,17 @@
 #include <list>
 #include <map>
 
-#include <db_cxx.h>
-
 #include "util.hh"
 
 using namespace std;
 
 
+/* Defined externally. */
+class DbTxn;
+class DbEnv;
+class Db;
+
+
 class Database;
 
 
diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index 267e478f4a..84c89a157a 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -13,6 +13,7 @@
 #include <cerrno>
 #include <ctime>
 #include <algorithm>
+#include <iostream>
 
 #include <unistd.h>
 
diff --git a/src/nix-store/dotgraph.cc b/src/nix-store/dotgraph.cc
index 1d8ebfbd03..053358e3ad 100644
--- a/src/nix-store/dotgraph.cc
+++ b/src/nix-store/dotgraph.cc
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include "dotgraph.hh"
 #include "build.hh"