From 4e0607369e86f0a8e2d55df831567a410ffd3328 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 14 Dec 2014 01:51:14 +0100
Subject: [PATCH] Pedantry

---
 src/download-via-ssh/download-via-ssh.cc | 2 +-
 src/libexpr/parser.y                     | 4 ----
 src/libmain/shared.cc                    | 2 +-
 src/libstore/optimise-store.cc           | 2 +-
 src/libutil/monitor-fd.hh                | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/download-via-ssh/download-via-ssh.cc b/src/download-via-ssh/download-via-ssh.cc
index 164c24b49..f71cf5650 100644
--- a/src/download-via-ssh/download-via-ssh.cc
+++ b/src/download-via-ssh/download-via-ssh.cc
@@ -9,7 +9,7 @@
 #include "store-api.hh"
 
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 #include <unistd.h>
 
 using namespace nix;
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index dcb270b86..ff174815e 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -53,10 +53,6 @@ namespace nix {
 #include "parser-tab.hh"
 #include "lexer-tab.hh"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 YY_DECL;
 
 using namespace nix;
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 9c74a614e..082705d9e 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -11,7 +11,7 @@
 #include <exception>
 #include <algorithm>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/libstore/optimise-store.cc b/src/libstore/optimise-store.cc
index fb5607676..55c252b9b 100644
--- a/src/libstore/optimise-store.cc
+++ b/src/libstore/optimise-store.cc
@@ -4,7 +4,7 @@
 #include "local-store.hh"
 #include "globals.hh"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/libutil/monitor-fd.hh b/src/libutil/monitor-fd.hh
index e99869eff..6f01ccd91 100644
--- a/src/libutil/monitor-fd.hh
+++ b/src/libutil/monitor-fd.hh
@@ -3,7 +3,7 @@
 #include <thread>
 #include <atomic>
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <poll.h>
 #include <sys/types.h>
 #include <unistd.h>