Revert "Fix Clang-tidy modernize-deprecated-headers warnings in remaining files; other minor fixes."

This reverts commit r265454 since it broke the build.  E.g.:

  http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/22413/

llvm-svn: 265459

llvm/unittests/Support/ProgramTest.cpp

@@ -7,19 +7,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringRef.h"
 #include "llvm/Support/ConvertUTF.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
-#include "llvm/Support/raw_ostream.h"
 #include "gtest/gtest.h"
-#include <cstdlib>
-#include <cstring>
-#include <string>
-#include <vector>
+#include <stdlib.h>
 #if defined(__APPLE__)
 # include <crt_externs.h>
 #elif !defined(_MSC_VER)
@@ -51,7 +45,6 @@ void sleep_for(unsigned int seconds) {
     GTEST_FATAL_FAILURE_(MessageStorage.c_str());                              \
   } else {                                                                     \
   }
-
 // From TestMain.cpp.
 extern const char *TestMainArgv0;
 
@@ -60,9 +53,9 @@ namespace {
 using namespace llvm;
 using namespace sys;
 
-cl::opt<std::string>
+static cl::opt<std::string>
 ProgramTestStringArg1("program-test-string-arg1");
-cl::opt<std::string>
+static cl::opt<std::string>
 ProgramTestStringArg2("program-test-string-arg2");
 
 class ProgramEnvTest : public testing::Test {
@@ -316,6 +309,7 @@ TEST(ProgramTest, TestExecuteNegative) {
     ASSERT_TRUE(ExecutionFailed);
     ASSERT_FALSE(Error.empty());
   }
+
 }
 
 #ifdef LLVM_ON_WIN32