diff --git a/src/nix-env/main.cc b/src/nix-env/main.cc
index 71c22d1a51..0d84bc610d 100644
--- a/src/nix-env/main.cc
+++ b/src/nix-env/main.cc
@@ -11,6 +11,7 @@
 
 #include <cerrno>
 #include <ctime>
+#include <algorithm>
 
 
 typedef enum {
@@ -871,7 +872,7 @@ static void opDefaultExpr(Globals & globals,
 
 
 static string needArg(Strings::iterator & i,
-    const Strings & args, const string & arg)
+    Strings & args, const string & arg)
 {
     ++i;
     if (i == args.end()) throw UsageError(
diff --git a/src/nix-env/profiles.cc b/src/nix-env/profiles.cc
index 1039634d60..6db291b3d2 100644
--- a/src/nix-env/profiles.cc
+++ b/src/nix-env/profiles.cc
@@ -4,6 +4,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
+#include <stdio.h>
 
 
 static bool cmpGensByNumber(const Generation & a, const Generation & b)
diff --git a/src/nix-store/main.cc b/src/nix-store/main.cc
index 87fbe58b1b..a6ff117cb4 100644
--- a/src/nix-store/main.cc
+++ b/src/nix-store/main.cc
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <algorithm>
 
 #include "globals.hh"
 #include "build.hh"