[Stdlib] Clean up includes in LibcShims and Random.

Author: mikeash

stdlib/public/stubs/LibcShims.cpp

@@ -19,27 +19,18 @@
 #include <io.h>
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
-#else
-#include <unistd.h>
 #endif
 
-#include <algorithm>
-#include <cmath>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <sys/types.h>
+
 #include <type_traits>
 
-#include "llvm/Support/DataTypes.h"
-#include "swift/Basic/Lazy.h"
-#include "swift/Runtime/Config.h"
-#include "swift/Runtime/Debug.h"
 #include "../SwiftShims/LibcShims.h"
 
 using namespace swift;
 
-static_assert(std::is_same<ssize_t, swift::__swift_ssize_t>::value,
+static_assert(std::is_same<ssize_t, __swift_ssize_t>::value,
               "__swift_ssize_t must be defined as equivalent to ssize_t in LibcShims.h");
 #if !defined(_WIN32) || defined(__CYGWIN__)
 static_assert(std::is_same<mode_t, swift::__swift_mode_t>::value,

stdlib/public/stubs/Random.cpp

@@ -22,6 +22,7 @@
 #include <Bcrypt.h>
 #pragma comment(lib, "Bcrypt.lib")
 #else
+#include <errno.h>
 #include <unistd.h>
 #endif
 

stdlib/public/stubs/Stubs.cpp

@@ -280,7 +280,7 @@ uint64_t swift_float80ToString(char *Buffer, size_t BufferLength,
 ///
 /// \returns Size of character data returned in \c LinePtr, or -1
 /// if an error occurred, or EOF was reached.
-swift::__swift_ssize_t
+__swift_ssize_t
 swift::swift_stdlib_readLine_stdin(unsigned char **LinePtr) {
 #if defined(_WIN32)
   if (LinePtr == nullptr)