diff --git a/lib/System/Unix/Unix.h b/lib/System/Unix/Unix.h
index 83d2865..676cbb4 100644
--- a/lib/System/Unix/Unix.h
+++ b/lib/System/Unix/Unix.h
@@ -1,4 +1,4 @@
-//===- llvm/System/Unix/Unix.h - Common Unix Include File -----*- C++ -*-===//
+//===- llvm/System/Unix/Unix.h - Common Unix Include File -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -16,10 +16,12 @@
 //===          is guaranteed to work on all UNIX variants.
 //===----------------------------------------------------------------------===//
 
+#include "Config/config.h"     // Get autoconf configuration settings
 #include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cerrno>
 #include <sys/types.h>
 #include <sys/param.h>