diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index ada1cf8ec..c82f60748 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -23,8 +23,8 @@
 #include <chrono>
 #include <regex>
 #include <queue>
+#include <climits>
 
-#include <limits.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/types.h>
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 34c1d96dc..79716c5a7 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -10,6 +10,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <climits>
 #include <iostream>
 #include <sstream>
 #include <thread>
@@ -17,7 +18,6 @@
 
 #include <fcntl.h>
 #include <grp.h>
-#include <limits.h>
 #include <pwd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
diff --git a/src/libutil/xml-writer.cc b/src/libutil/xml-writer.cc
index e5cc2e9fc..68857e34d 100644
--- a/src/libutil/xml-writer.cc
+++ b/src/libutil/xml-writer.cc
@@ -1,10 +1,10 @@
-#include <assert.h>
+#include <cassert>
 
 #include "xml-writer.hh"
 
 
 namespace nix {
-    
+
 
 XMLWriter::XMLWriter(bool indent, std::ostream & output)
     : output(output), indent(indent)
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index da17ddcba..65ae88faf 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -10,8 +10,9 @@
 #include "daemon.hh"
 
 #include <algorithm>
-
+#include <climits>
 #include <cstring>
+
 #include <unistd.h>
 #include <signal.h>
 #include <sys/types.h>
@@ -23,7 +24,6 @@
 #include <pwd.h>
 #include <grp.h>
 #include <fcntl.h>
-#include <limits.h>
 
 #if __APPLE__ || __FreeBSD__
 #include <sys/ucred.h>