diff --git a/lib/Debugger/SourceLanguage-Unknown.cpp b/lib/Debugger/SourceLanguage-Unknown.cpp
index 514afa3bc24..b806fc779ef 100644
--- a/lib/Debugger/SourceLanguage-Unknown.cpp
+++ b/lib/Debugger/SourceLanguage-Unknown.cpp
@@ -59,7 +59,7 @@ SLUCache::SLUCache(ProgramInfo &pi) : PI(pi) {
 //
 
 namespace {
-  struct SLU : public SourceLanguage {
+  static struct SLU : public SourceLanguage {
     //===------------------------------------------------------------------===//
     // Implement the miscellaneous methods...
     //
diff --git a/lib/Support/Debug.cpp b/lib/Support/Debug.cpp
index 29eda26c689..a09cddf9022 100644
--- a/lib/Support/Debug.cpp
+++ b/lib/Support/Debug.cpp
@@ -33,19 +33,19 @@ namespace {
 #ifndef NDEBUG
   // -debug - Command line option to enable the DEBUG statements in the passes.
   // This flag may only be enabled in debug builds.
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   Debug("debug", cl::desc("Enable debug output"), cl::Hidden,
         cl::location(DebugFlag));
 
-  std::string CurrentDebugType;
-  struct DebugOnlyOpt {
+  static std::string CurrentDebugType;
+  static struct DebugOnlyOpt {
     void operator=(const std::string &Val) const {
       DebugFlag |= !Val.empty();
       CurrentDebugType = Val;
     }
   } DebugOnlyOptLoc;
 
-  cl::opt<DebugOnlyOpt, true, cl::parser<std::string> >
+  static cl::opt<DebugOnlyOpt, true, cl::parser<std::string> >
   DebugOnly("debug-only", cl::desc("Enable a specific type of debug output"),
             cl::Hidden, cl::value_desc("debug string"),
             cl::location(DebugOnlyOptLoc), cl::ValueRequired);
diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp
index 6d4a2c29fbf..9cbb3c705c5 100644
--- a/lib/Support/Timer.cpp
+++ b/lib/Support/Timer.cpp
@@ -39,12 +39,12 @@ static std::string &getLibSupportInfoOutputFilename() {
 }
 
 namespace {
-  cl::opt<bool>
+  static cl::opt<bool>
   TrackSpace("track-memory", cl::desc("Enable -time-passes memory "
                                       "tracking (this may be slow)"),
              cl::Hidden);
 
-  cl::opt<std::string, true>
+  static cl::opt<std::string, true>
   InfoOutputFilename("info-output-file", cl::value_desc("filename"),
                      cl::desc("File to append -stats and -timer output to"),
                    cl::Hidden, cl::location(getLibSupportInfoOutputFilename()));
diff --git a/lib/Target/TargetMachine.cpp b/lib/Target/TargetMachine.cpp
index 4b3371d92a2..b19066a98d9 100644
--- a/lib/Target/TargetMachine.cpp
+++ b/lib/Target/TargetMachine.cpp
@@ -40,59 +40,59 @@ namespace llvm {
   unsigned StackAlignment;
 }
 namespace {
-  cl::opt<bool, true> PrintCode("print-machineinstrs",
+  static cl::opt<bool, true> PrintCode("print-machineinstrs",
     cl::desc("Print generated machine code"),
     cl::location(PrintMachineCode), cl::init(false));
 
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
     DisableFPElim("disable-fp-elim",
                   cl::desc("Disable frame pointer elimination optimization"),
                   cl::location(NoFramePointerElim),
                   cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   DisableExcessPrecision("disable-excess-fp-precision",
                cl::desc("Disable optimizations that may increase FP precision"),
                cl::location(NoExcessFPPrecision),
                cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   EnableUnsafeFPMath("enable-unsafe-fp-math",
                cl::desc("Enable optimizations that may decrease FP precision"),
                cl::location(UnsafeFPMath),
                cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   EnableFiniteOnlyFPMath("enable-finite-only-fp-math",
                cl::desc("Enable optimizations that assumes non- NaNs / +-Infs"),
                cl::location(FiniteOnlyFPMathOption),
                cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   EnableHonorSignDependentRoundingFPMath(cl::Hidden,
                "enable-sign-dependent-rounding-fp-math",
        cl::desc("Force codegen to assume rounding mode can change dynamically"),
                cl::location(HonorSignDependentRoundingFPMathOption),
                cl::init(false));
 
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   GenerateSoftFloatCalls("soft-float",
                cl::desc("Generate software floating point library calls"),
                cl::location(UseSoftFloat),
                cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   DontPlaceZerosInBSS("nozero-initialized-in-bss",
               cl::desc("Don't place zero-initialized symbols into bss section"),
               cl::location(NoZerosInBSS),
               cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   EnableExceptionHandling("enable-eh",
                cl::desc("Emit DWARF exception handling (default if target supports)"),
                cl::location(ExceptionHandling),
                cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   EnableUnwindTables("unwind-tables",
                cl::desc("Generate unwinding tables for all functions"),
                cl::location(UnwindTablesMandatory),
                cl::init(false));
 
-  cl::opt<llvm::Reloc::Model, true>
+  static cl::opt<llvm::Reloc::Model, true>
   DefRelocationModel(
     "relocation-model",
     cl::desc("Choose relocation model"),
@@ -108,7 +108,7 @@ namespace {
       clEnumValN(Reloc::DynamicNoPIC, "dynamic-no-pic",
                  "  Relocatable external references, non-relocatable code"),
       clEnumValEnd));
-  cl::opt<llvm::CodeModel::Model, true>
+  static cl::opt<llvm::CodeModel::Model, true>
   DefCodeModel(
     "code-model",
     cl::desc("Choose code model"),
@@ -127,12 +127,12 @@ namespace {
                  "  Large code model"),
       clEnumValEnd));
 
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   EnablePerformTailCallOpt("tailcallopt",
                            cl::desc("Turn on tail call optimization."),
                            cl::location(PerformTailCallOpt),
                            cl::init(false));
-  cl::opt<bool, true>
+  static cl::opt<bool, true>
   EnableOptimizeForSize("optimize-size",
                         cl::desc("Optimize for size."),
                            cl::location(OptimizeForSize),