From 7c16caa33600bc473532fc2730aad1f62738b3ef Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Wed, 1 Sep 2004 22:55:40 +0000
Subject: [PATCH] Changes For Bug 352 Move include/Config and include/Support
 into include/llvm/Config, include/llvm/ADT and include/llvm/Support. From
 here on out, all LLVM public header files must be under include/llvm/.

llvm-svn: 16137
---
 llvm/autoconf/configure.ac                    | 14 +++++++-------
 llvm/configure                                | 18 +++++++++---------
 .../{Support => llvm/ADT}/BitSetVector.h      |  6 +++---
 llvm/include/{Support => llvm/ADT}/DenseMap.h |  6 +++---
 .../ADT}/DepthFirstIterator.h                 | 12 ++++++------
 .../ADT}/EquivalenceClasses.h                 |  6 +++---
 .../{Support => llvm/ADT}/GraphTraits.h       |  6 +++---
 .../{Support => llvm/ADT}/HashExtras.h        |  8 ++++----
 .../{Support => llvm/ADT}/PostOrderIterator.h | 12 ++++++------
 .../{Support => llvm/ADT}/SCCIterator.h       | 12 ++++++------
 .../include/{Support => llvm/ADT}/STLExtras.h |  8 ++++----
 .../{Support => llvm/ADT}/SetOperations.h     |  6 +++---
 .../include/{Support => llvm/ADT}/SetVector.h |  6 +++---
 .../include/{Support => llvm/ADT}/Statistic.h |  6 +++---
 .../{Support => llvm/ADT}/StringExtras.h      |  8 ++++----
 llvm/include/{Support => llvm/ADT}/Tree.h     |  6 +++---
 .../{Support => llvm/ADT}/VectorExtras.h      |  6 +++---
 .../include/{Support => llvm/ADT}/hash_map.in |  8 ++++----
 .../include/{Support => llvm/ADT}/hash_set.in |  8 ++++----
 llvm/include/{Support => llvm/ADT}/ilist      |  8 ++++----
 .../include/{Support => llvm/ADT}/iterator.in |  6 +++---
 llvm/include/llvm/Analysis/AliasSetTracker.h  |  6 +++---
 llvm/include/llvm/Analysis/CallGraph.h        |  4 ++--
 llvm/include/llvm/Analysis/ConstantsScanner.h |  2 +-
 .../Analysis/DataStructure/DSGraphTraits.h    |  6 +++---
 .../llvm/Analysis/DataStructure/DSSupport.h   |  2 +-
 .../Analysis/DataStructure/DataStructure.h    |  2 +-
 llvm/include/llvm/Analysis/Interval.h         |  2 +-
 llvm/include/llvm/Analysis/LoopInfo.h         |  2 +-
 llvm/include/llvm/BasicBlock.h                |  2 +-
 llvm/include/llvm/CodeGen/MachineBasicBlock.h |  4 ++--
 .../include/llvm/CodeGen/MachineCodeEmitter.h |  2 +-
 llvm/include/llvm/CodeGen/MachineFunction.h   |  2 +-
 llvm/include/llvm/CodeGen/MachineInstr.h      |  2 +-
 llvm/include/llvm/CodeGen/SSARegMap.h         |  2 +-
 llvm/include/llvm/CodeGen/SchedGraphCommon.h  |  2 +-
 llvm/include/llvm/CodeGen/SelectionDAG.h      |  2 +-
 llvm/include/{ => llvm}/Config/alloca.h       |  2 +-
 llvm/include/{ => llvm}/Config/config.h.in    |  2 +-
 llvm/include/{ => llvm}/Config/dlfcn.h        |  2 +-
 llvm/include/{ => llvm}/Config/fcntl.h        |  2 +-
 llvm/include/{ => llvm}/Config/limits.h       |  2 +-
 llvm/include/{ => llvm}/Config/malloc.h       |  2 +-
 llvm/include/{ => llvm}/Config/memory.h       |  2 +-
 llvm/include/{ => llvm}/Config/pagesize.h     |  2 +-
 llvm/include/{ => llvm}/Config/stdint.h       |  2 +-
 llvm/include/{ => llvm}/Config/sys/mman.h     |  2 +-
 llvm/include/{ => llvm}/Config/sys/resource.h |  6 +++---
 llvm/include/{ => llvm}/Config/sys/stat.h     |  2 +-
 llvm/include/{ => llvm}/Config/sys/time.h     |  2 +-
 llvm/include/{ => llvm}/Config/sys/types.h    |  2 +-
 llvm/include/{ => llvm}/Config/sys/wait.h     |  2 +-
 llvm/include/{ => llvm}/Config/time.h         |  2 +-
 llvm/include/{ => llvm}/Config/unistd.h       |  2 +-
 llvm/include/{ => llvm}/Config/windows.h      |  2 +-
 llvm/include/llvm/Constants.h                 |  2 +-
 .../llvm/ExecutionEngine/GenericValue.h       |  2 +-
 llvm/include/llvm/Function.h                  |  2 +-
 llvm/include/{ => llvm}/Support/Annotation.h  |  6 +++---
 llvm/include/llvm/Support/CFG.h               |  4 ++--
 llvm/include/{ => llvm}/Support/Casting.h     |  6 +++---
 llvm/include/{ => llvm}/Support/CommandLine.h |  8 ++++----
 llvm/include/llvm/Support/ConstantRange.h     |  2 +-
 .../{ => llvm}/Support/DOTGraphTraits.h       |  6 +++---
 .../include/{ => llvm}/Support/DataTypes.h.in |  0
 llvm/include/{ => llvm}/Support/Debug.h       |  6 +++---
 .../{ => llvm}/Support/DynamicLinker.h        |  6 +++---
 llvm/include/{ => llvm}/Support/ELF.h         |  9 +++++++--
 .../{ => llvm}/Support/FileUtilities.h        |  6 +++---
 llvm/include/{ => llvm}/Support/GraphWriter.h | 10 +++++-----
 .../include/{ => llvm}/Support/LeakDetector.h |  6 +++---
 .../{ => llvm}/Support/MallocAllocator.h      |  6 +++---
 llvm/include/llvm/Support/Mangler.h           |  2 +-
 llvm/include/{ => llvm}/Support/MathExtras.h  |  8 ++++----
 llvm/include/llvm/Support/PassNameParser.h    |  2 +-
 .../include/{ => llvm}/Support/PluginLoader.h |  8 ++++----
 .../Support/SlowOperationInformer.h           |  6 +++---
 llvm/include/{ => llvm}/Support/SystemUtils.h |  4 ++--
 .../Support/ThreadSupport-NoSupport.h         |  4 ++--
 .../Support/ThreadSupport-PThreads.h          |  4 ++--
 .../{ => llvm}/Support/ThreadSupport.h.in     |  4 ++--
 llvm/include/{ => llvm}/Support/Timer.h       |  6 +++---
 llvm/include/llvm/Support/ToolRunner.h        |  8 ++++----
 llvm/include/{ => llvm}/Support/TypeInfo.h    |  6 +++---
 llvm/include/{ => llvm}/Support/type_traits.h |  2 +-
 llvm/include/llvm/Target/TargetData.h         |  2 +-
 llvm/include/llvm/Target/TargetInstrInfo.h    |  2 +-
 .../llvm/Target/TargetMachineRegistry.h       |  2 +-
 llvm/include/llvm/Target/TargetSchedInfo.h    |  2 +-
 llvm/include/llvm/Type.h                      |  6 +++---
 llvm/include/llvm/Use.h                       |  2 +-
 llvm/include/llvm/Value.h                     |  2 +-
 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp  |  2 +-
 llvm/lib/Analysis/CFGPrinter.cpp              |  2 +-
 .../DataStructure/BottomUpClosure.cpp         |  4 ++--
 .../DataStructure/CompleteBottomUp.cpp        |  8 ++++----
 .../Analysis/DataStructure/DataStructure.cpp  | 12 ++++++------
 .../DataStructure/DataStructureOpt.cpp        |  2 +-
 .../DataStructure/DataStructureStats.cpp      |  2 +-
 .../Analysis/DataStructure/DependenceGraph.h  |  2 +-
 .../Analysis/DataStructure/GraphChecker.cpp   |  2 +-
 llvm/lib/Analysis/DataStructure/IPModRef.cpp  |  6 +++---
 llvm/lib/Analysis/DataStructure/IPModRef.h    |  4 ++--
 llvm/lib/Analysis/DataStructure/Local.cpp     |  6 +++---
 .../DataStructure/MemoryDepAnalysis.cpp       | 10 +++++-----
 .../DataStructure/MemoryDepAnalysis.h         |  2 +-
 .../Analysis/DataStructure/Parallelize.cpp    |  8 ++++----
 .../DataStructure/PgmDependenceGraph.h        |  2 +-
 llvm/lib/Analysis/DataStructure/Printer.cpp   |  6 +++---
 .../Analysis/DataStructure/Steensgaard.cpp    |  2 +-
 .../Analysis/DataStructure/TopDownClosure.cpp |  4 ++--
 llvm/lib/Analysis/IPA/Andersens.cpp           |  4 ++--
 llvm/lib/Analysis/IPA/CallGraph.cpp           |  2 +-
 llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp    |  2 +-
 .../Analysis/IPA/FindUnsafePointerTypes.cpp   |  2 +-
 llvm/lib/Analysis/IPA/GlobalsModRef.cpp       |  6 +++---
 llvm/lib/Analysis/IPA/PrintSCC.cpp            |  2 +-
 llvm/lib/Analysis/InstCount.cpp               |  2 +-
 llvm/lib/Analysis/IntervalPartition.cpp       |  2 +-
 llvm/lib/Analysis/LoopInfo.cpp                |  2 +-
 llvm/lib/Analysis/PostDominators.cpp          |  4 ++--
 llvm/lib/Analysis/ProfileInfoLoaderPass.cpp   |  2 +-
 llvm/lib/Analysis/ScalarEvolution.cpp         |  4 ++--
 llvm/lib/AsmParser/ParserInternals.h          |  2 +-
 llvm/lib/AsmParser/llvmAsmParser.y            |  2 +-
 llvm/lib/Bytecode/Reader/ArchiveReader.cpp    |  2 +-
 llvm/lib/Bytecode/Reader/Reader.cpp           | 14 ++++++++++----
 llvm/lib/Bytecode/Reader/ReaderWrappers.cpp   |  6 +++---
 llvm/lib/Bytecode/Writer/SlotCalculator.cpp   |  4 ++--
 llvm/lib/Bytecode/Writer/Writer.cpp           |  4 ++--
 llvm/lib/Bytecode/Writer/WriterInternals.h    |  2 +-
 llvm/lib/CodeGen/BranchFolding.cpp            |  2 +-
 .../CodeGen/InstrSched/InstrScheduling.cpp    |  2 +-
 llvm/lib/CodeGen/InstrSched/SchedGraph.cpp    |  2 +-
 llvm/lib/CodeGen/InstrSched/SchedGraph.h      |  4 ++--
 .../CodeGen/InstrSched/SchedGraphCommon.cpp   |  2 +-
 .../CodeGen/InstrSched/SchedPriorities.cpp    |  2 +-
 llvm/lib/CodeGen/InstrSched/SchedPriorities.h |  2 +-
 llvm/lib/CodeGen/LiveInterval.cpp             |  2 +-
 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp     |  8 ++++----
 llvm/lib/CodeGen/LiveVariables.cpp            |  4 ++--
 llvm/lib/CodeGen/MachineBasicBlock.cpp        |  2 +-
 llvm/lib/CodeGen/MachineFunction.cpp          |  4 ++--
 llvm/lib/CodeGen/MachineInstr.cpp             |  2 +-
 .../CodeGen/ModuloScheduling/MSSchedule.cpp   |  2 +-
 .../CodeGen/ModuloScheduling/MSchedGraph.cpp  |  2 +-
 .../CodeGen/ModuloScheduling/MSchedGraph.h    |  6 +++---
 .../ModuloScheduling/ModuloScheduling.cpp     |  6 +++---
 llvm/lib/CodeGen/PHIElimination.cpp           |  4 ++--
 llvm/lib/CodeGen/Passes.cpp                   |  2 +-
 llvm/lib/CodeGen/RegAllocIterativeScan.cpp    |  6 +++---
 llvm/lib/CodeGen/RegAllocLinearScan.cpp       |  6 +++---
 llvm/lib/CodeGen/RegAllocLocal.cpp            |  8 ++++----
 llvm/lib/CodeGen/RegAllocSimple.cpp           |  6 +++---
 .../lib/CodeGen/TwoAddressInstructionPass.cpp |  6 +++---
 llvm/lib/CodeGen/UnreachableBlockElim.cpp     |  2 +-
 llvm/lib/CodeGen/VirtRegMap.cpp               | 10 +++++-----
 llvm/lib/CodeGen/VirtRegMap.h                 |  2 +-
 llvm/lib/Debugger/Debugger.cpp                |  2 +-
 llvm/lib/Debugger/ProgramInfo.cpp             |  6 +++---
 llvm/lib/Debugger/SourceFile.cpp              |  4 ++--
 .../lib/Debugger/UnixLocalInferiorProcess.cpp |  4 ++--
 llvm/lib/ExecutionEngine/ExecutionEngine.cpp  |  6 +++---
 .../ExecutionEngine/Interpreter/Execution.cpp |  4 ++--
 .../Interpreter/ExternalFunctions.cpp         |  2 +-
 .../ExecutionEngine/Interpreter/Interpreter.h |  2 +-
 llvm/lib/ExecutionEngine/JIT/Emitter.cpp      |  6 +++---
 llvm/lib/ExecutionEngine/JIT/Intercept.cpp    |  2 +-
 llvm/lib/ExecutionEngine/JIT/JIT.cpp          |  2 +-
 llvm/lib/Support/Annotation.cpp               |  2 +-
 llvm/lib/Support/CommandLine.cpp              |  4 ++--
 llvm/lib/Support/Debug.cpp                    |  4 ++--
 llvm/lib/Support/DynamicLinker.cpp            |  6 +++---
 llvm/lib/Support/FileUtilities.cpp            | 16 ++++++++--------
 llvm/lib/Support/IsInf.cpp                    |  2 +-
 llvm/lib/Support/IsNAN.cpp                    |  2 +-
 llvm/lib/Support/PluginLoader.cpp             |  4 ++--
 llvm/lib/Support/SlowOperationInformer.cpp    |  4 ++--
 llvm/lib/Support/Statistic.cpp                |  4 ++--
 llvm/lib/Support/StringExtras.cpp             |  2 +-
 llvm/lib/Support/SystemUtils.cpp              | 18 +++++++++---------
 llvm/lib/Support/Timer.cpp                    | 14 +++++++-------
 llvm/lib/Support/ToolRunner.cpp               |  6 +++---
 llvm/lib/System/Unix/Path.cpp                 |  2 +-
 llvm/lib/System/Unix/Program.cpp              |  2 +-
 llvm/lib/System/Unix/Unix.h                   |  2 +-
 llvm/lib/Target/CBackend/Writer.cpp           |  6 +++---
 llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp   |  8 ++++----
 llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp  |  2 +-
 llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp   |  4 ++--
 llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp |  6 +++---
 llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp   | 10 +++++-----
 llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp   |  4 ++--
 llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp |  6 +++---
 .../Target/PowerPC/PowerPCBranchSelector.cpp  |  2 +-
 .../Target/PowerPC/PowerPCTargetMachine.cpp   |  2 +-
 llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp |  2 +-
 llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h   |  2 +-
 .../SparcV9/LiveVar/FunctionLiveVarInfo.cpp   |  6 +++---
 .../SparcV9/LiveVar/FunctionLiveVarInfo.h     |  2 +-
 llvm/lib/Target/SparcV9/MachineFunctionInfo.h |  4 ++--
 llvm/lib/Target/SparcV9/MappingInfo.cpp       |  2 +-
 .../SparcV9/RegAlloc/InterferenceGraph.cpp    |  2 +-
 llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h  |  2 +-
 .../Target/SparcV9/RegAlloc/LiveRangeInfo.cpp |  2 +-
 .../Target/SparcV9/RegAlloc/LiveRangeInfo.h   |  2 +-
 .../Target/SparcV9/RegAlloc/PhyRegAlloc.cpp   |  6 +++---
 llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp |  4 ++--
 llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp   | 12 ++++++------
 .../lib/Target/SparcV9/SparcV9CodeEmitter.cpp |  8 ++++----
 llvm/lib/Target/SparcV9/SparcV9Internals.h    |  2 +-
 .../Target/SparcV9/SparcV9PeepholeOpts.cpp    |  2 +-
 llvm/lib/Target/SparcV9/SparcV9RegInfo.h      |  2 +-
 .../Target/SparcV9/SparcV9TargetMachine.cpp   |  2 +-
 llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp   |  2 +-
 llvm/lib/Target/TargetData.cpp                |  2 +-
 llvm/lib/Target/TargetMachine.cpp             |  2 +-
 llvm/lib/Target/X86/X86AsmPrinter.cpp         |  6 +++---
 llvm/lib/Target/X86/X86CodeEmitter.cpp        |  6 +++---
 llvm/lib/Target/X86/X86FloatingPoint.cpp      |  8 ++++----
 llvm/lib/Target/X86/X86ISelSimple.cpp         |  2 +-
 llvm/lib/Target/X86/X86PeepholeOpt.cpp        |  4 ++--
 llvm/lib/Target/X86/X86RegisterInfo.cpp       |  4 ++--
 llvm/lib/Target/X86/X86TargetMachine.cpp      |  4 ++--
 llvm/lib/Transforms/ExprTypeConvert.cpp       |  4 ++--
 llvm/lib/Transforms/IPO/ArgumentPromotion.cpp |  8 ++++----
 llvm/lib/Transforms/IPO/ConstantMerge.cpp     |  2 +-
 .../IPO/DeadArgumentElimination.cpp           |  6 +++---
 .../Transforms/IPO/DeadTypeElimination.cpp    |  2 +-
 .../lib/Transforms/IPO/FunctionResolution.cpp |  2 +-
 llvm/lib/Transforms/IPO/GlobalConstifier.cpp  |  4 ++--
 llvm/lib/Transforms/IPO/GlobalDCE.cpp         |  2 +-
 .../Transforms/IPO/IPConstantPropagation.cpp  |  2 +-
 llvm/lib/Transforms/IPO/Inliner.cpp           |  6 +++---
 llvm/lib/Transforms/IPO/Internalize.cpp       |  6 +++---
 llvm/lib/Transforms/IPO/LoopExtractor.cpp     |  2 +-
 llvm/lib/Transforms/IPO/LowerSetJmp.cpp       |  8 ++++----
 llvm/lib/Transforms/IPO/PruneEH.cpp           |  2 +-
 llvm/lib/Transforms/IPO/RaiseAllocations.cpp  |  2 +-
 .../Instrumentation/ProfilePaths/Graph.cpp    |  2 +-
 .../ProfilePaths/GraphAuxiliary.cpp           |  2 +-
 .../ProfilePaths/InstLoops.cpp                |  2 +-
 .../Instrumentation/TraceBasicBlocks.cpp      |  2 +-
 .../Instrumentation/TraceValues.cpp           |  4 ++--
 llvm/lib/Transforms/LevelRaise.cpp            |  8 ++++----
 llvm/lib/Transforms/Scalar/ADCE.cpp           |  8 ++++----
 .../Transforms/Scalar/BasicBlockPlacement.cpp |  2 +-
 llvm/lib/Transforms/Scalar/ConstantProp.cpp   |  2 +-
 .../lib/Transforms/Scalar/CorrelatedExprs.cpp |  6 +++---
 llvm/lib/Transforms/Scalar/DCE.cpp            |  2 +-
 .../Scalar/DeadStoreElimination.cpp           |  4 ++--
 .../Scalar/DecomposeMultiDimRefs.cpp          |  4 ++--
 llvm/lib/Transforms/Scalar/GCSE.cpp           |  4 ++--
 llvm/lib/Transforms/Scalar/IndVarSimplify.cpp |  4 ++--
 .../Scalar/InstructionCombining.cpp           |  4 ++--
 llvm/lib/Transforms/Scalar/LICM.cpp           |  6 +++---
 llvm/lib/Transforms/Scalar/LoopSimplify.cpp   |  8 ++++----
 llvm/lib/Transforms/Scalar/LoopUnroll.cpp     |  8 ++++----
 llvm/lib/Transforms/Scalar/LoopUnswitch.cpp   |  4 ++--
 .../Transforms/Scalar/LowerAllocations.cpp    |  2 +-
 llvm/lib/Transforms/Scalar/LowerInvoke.cpp    |  4 ++--
 llvm/lib/Transforms/Scalar/LowerPacked.cpp    |  2 +-
 llvm/lib/Transforms/Scalar/LowerSelect.cpp    |  2 +-
 llvm/lib/Transforms/Scalar/LowerSwitch.cpp    |  4 ++--
 llvm/lib/Transforms/Scalar/Mem2Reg.cpp        |  2 +-
 llvm/lib/Transforms/Scalar/PRE.cpp            | 10 +++++-----
 .../lib/Transforms/Scalar/PiNodeInsertion.cpp |  2 +-
 llvm/lib/Transforms/Scalar/Reassociate.cpp    |  6 +++---
 llvm/lib/Transforms/Scalar/SCCP.cpp           |  8 ++++----
 .../Scalar/ScalarReplAggregates.cpp           |  6 +++---
 llvm/lib/Transforms/Scalar/SimplifyCFG.cpp    |  2 +-
 .../lib/Transforms/Scalar/TailDuplication.cpp |  6 +++---
 .../Scalar/TailRecursionElimination.cpp       |  2 +-
 .../Transforms/Utils/BreakCriticalEdges.cpp   |  2 +-
 llvm/lib/Transforms/Utils/CodeExtractor.cpp   |  6 +++---
 llvm/lib/Transforms/Utils/Local.cpp           |  2 +-
 .../Utils/PromoteMemoryToRegister.cpp         |  2 +-
 llvm/lib/Transforms/Utils/SimplifyCFG.cpp     |  2 +-
 llvm/lib/VMCore/AsmWriter.cpp                 |  4 ++--
 llvm/lib/VMCore/BasicBlock.cpp                |  2 +-
 llvm/lib/VMCore/Constants.cpp                 |  2 +-
 llvm/lib/VMCore/Dominators.cpp                |  4 ++--
 llvm/lib/VMCore/Function.cpp                  |  2 +-
 llvm/lib/VMCore/Globals.cpp                   |  2 +-
 llvm/lib/VMCore/Instruction.cpp               |  2 +-
 llvm/lib/VMCore/LeakDetector.cpp              |  2 +-
 llvm/lib/VMCore/Mangler.cpp                   |  2 +-
 llvm/lib/VMCore/Module.cpp                    |  4 ++--
 llvm/lib/VMCore/Pass.cpp                      |  4 ++--
 llvm/lib/VMCore/PassManagerT.h                |  6 +++---
 llvm/lib/VMCore/SymbolTable.cpp               |  2 +-
 llvm/lib/VMCore/Type.cpp                      |  6 +++---
 llvm/lib/VMCore/Value.cpp                     |  2 +-
 llvm/lib/VMCore/Verifier.cpp                  |  2 +-
 .../Stacker/lib/compiler/StackerParser.y      |  4 ++--
 llvm/projects/Stacker/lib/runtime/Makefile    |  3 ++-
 llvm/projects/Stacker/tools/stkrc/stkrc.cpp   |  2 +-
 llvm/projects/sample/lib/sample/sample.c      |  2 +-
 llvm/runtime/libtrace/tracelib.c              |  2 +-
 llvm/tools/analyze/GraphPrinters.cpp          |  2 +-
 llvm/tools/analyze/analyze.cpp                |  4 ++--
 llvm/tools/bugpoint/BugDriver.cpp             |  4 ++--
 llvm/tools/bugpoint/CrashDebugger.cpp         |  2 +-
 llvm/tools/bugpoint/ExecutionDriver.cpp       |  8 ++++----
 llvm/tools/bugpoint/ExtractFunction.cpp       |  6 +++---
 llvm/tools/bugpoint/Miscompilation.cpp        |  4 ++--
 llvm/tools/bugpoint/OptimizerDriver.cpp       |  2 +-
 llvm/tools/bugpoint/bugpoint.cpp              | 19 +++++++------------
 llvm/tools/extract/extract.cpp                |  2 +-
 llvm/tools/gccas/gccas.cpp                    |  2 +-
 llvm/tools/gccld/GenerateCode.cpp             |  4 ++--
 llvm/tools/gccld/Linker.cpp                   |  8 ++++----
 llvm/tools/gccld/gccld.cpp                    |  6 +++---
 llvm/tools/llc/llc.cpp                        |  4 ++--
 llvm/tools/llee/ExecveHandler.c               |  2 +-
 llvm/tools/llee/OSInterface.h                 |  2 +-
 llvm/tools/llee/StorageProxy.c                |  8 ++++----
 llvm/tools/llee/SysUtils.c                    | 12 ++++++------
 llvm/tools/lli/lli.cpp                        |  4 ++--
 llvm/tools/llvm-ar/llvm-ar.cpp                |  4 ++--
 llvm/tools/llvm-as/llvm-as.cpp                |  2 +-
 .../tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp |  2 +-
 llvm/tools/llvm-db/CLIDebugger.cpp            |  2 +-
 llvm/tools/llvm-db/Commands.cpp               |  4 ++--
 llvm/tools/llvm-db/llvm-db.cpp                |  4 ++--
 llvm/tools/llvm-dis/llvm-dis.cpp              |  2 +-
 llvm/tools/llvm-link/llvm-link.cpp            |  4 ++--
 llvm/tools/llvm-nm/llvm-nm.cpp                |  4 ++--
 llvm/tools/llvm-prof/llvm-prof.cpp            |  2 +-
 llvm/tools/llvm-stub/llvm-stub.c              |  2 +-
 llvm/tools/llvmc/CompilerDriver.cpp           |  6 +++---
 llvm/tools/llvmc/Configuration.cpp            |  6 +++---
 llvm/tools/llvmc/Configuration.h              |  2 +-
 llvm/tools/llvmc/llvmc.cpp                    |  2 +-
 llvm/tools/opt/opt.cpp                        |  4 ++--
 llvm/utils/TableGen/CodeEmitterGen.cpp        |  2 +-
 llvm/utils/TableGen/FileParser.y              |  2 +-
 llvm/utils/TableGen/InstrSelectorEmitter.cpp  |  4 ++--
 llvm/utils/TableGen/RegisterInfoEmitter.cpp   |  4 ++--
 llvm/utils/TableGen/TableGen.cpp              |  4 ++--
 llvm/utils/fpcmp/fpcmp.cpp                    |  4 ++--
 341 files changed, 720 insertions(+), 713 deletions(-)
 rename llvm/include/{Support => llvm/ADT}/BitSetVector.h (98%)
 rename llvm/include/{Support => llvm/ADT}/DenseMap.h (94%)
 rename llvm/include/{Support => llvm/ADT}/DepthFirstIterator.h (96%)
 rename llvm/include/{Support => llvm/ADT}/EquivalenceClasses.h (96%)
 rename llvm/include/{Support => llvm/ADT}/GraphTraits.h (95%)
 rename llvm/include/{Support => llvm/ADT}/HashExtras.h (87%)
 rename llvm/include/{Support => llvm/ADT}/PostOrderIterator.h (94%)
 rename llvm/include/{Support => llvm/ADT}/SCCIterator.h (96%)
 rename llvm/include/{Support => llvm/ADT}/STLExtras.h (98%)
 rename llvm/include/{Support => llvm/ADT}/SetOperations.h (94%)
 rename llvm/include/{Support => llvm/ADT}/SetVector.h (96%)
 rename llvm/include/{Support => llvm/ADT}/Statistic.h (96%)
 rename llvm/include/{Support => llvm/ADT}/StringExtras.h (95%)
 rename llvm/include/{Support => llvm/ADT}/Tree.h (94%)
 rename llvm/include/{Support => llvm/ADT}/VectorExtras.h (89%)
 rename llvm/include/{Support => llvm/ADT}/hash_map.in (92%)
 rename llvm/include/{Support => llvm/ADT}/hash_set.in (92%)
 rename llvm/include/{Support => llvm/ADT}/ilist (99%)
 rename llvm/include/{Support => llvm/ADT}/iterator.in (94%)
 rename llvm/include/{ => llvm}/Config/alloca.h (97%)
 rename llvm/include/{ => llvm}/Config/config.h.in (98%)
 rename llvm/include/{ => llvm}/Config/dlfcn.h (94%)
 rename llvm/include/{ => llvm}/Config/fcntl.h (94%)
 rename llvm/include/{ => llvm}/Config/limits.h (94%)
 rename llvm/include/{ => llvm}/Config/malloc.h (95%)
 rename llvm/include/{ => llvm}/Config/memory.h (94%)
 rename llvm/include/{ => llvm}/Config/pagesize.h (97%)
 rename llvm/include/{ => llvm}/Config/stdint.h (94%)
 rename llvm/include/{ => llvm}/Config/sys/mman.h (96%)
 rename llvm/include/{ => llvm}/Config/sys/resource.h (90%)
 rename llvm/include/{ => llvm}/Config/sys/stat.h (95%)
 rename llvm/include/{ => llvm}/Config/sys/time.h (95%)
 rename llvm/include/{ => llvm}/Config/sys/types.h (95%)
 rename llvm/include/{ => llvm}/Config/sys/wait.h (95%)
 rename llvm/include/{ => llvm}/Config/time.h (96%)
 rename llvm/include/{ => llvm}/Config/unistd.h (95%)
 rename llvm/include/{ => llvm}/Config/windows.h (94%)
 rename llvm/include/{ => llvm}/Support/Annotation.h (98%)
 rename llvm/include/{ => llvm}/Support/Casting.h (98%)
 rename llvm/include/{ => llvm}/Support/CommandLine.h (99%)
 rename llvm/include/{ => llvm}/Support/DOTGraphTraits.h (96%)
 rename llvm/include/{ => llvm}/Support/DataTypes.h.in (100%)
 rename llvm/include/{ => llvm}/Support/Debug.h (94%)
 rename llvm/include/{ => llvm}/Support/DynamicLinker.h (90%)
 rename llvm/include/{ => llvm}/Support/ELF.h (98%)
 rename llvm/include/{ => llvm}/Support/FileUtilities.h (97%)
 rename llvm/include/{ => llvm}/Support/GraphWriter.h (96%)
 rename llvm/include/{ => llvm}/Support/LeakDetector.h (95%)
 rename llvm/include/{ => llvm}/Support/MallocAllocator.h (94%)
 rename llvm/include/{ => llvm}/Support/MathExtras.h (87%)
 rename llvm/include/{ => llvm}/Support/PluginLoader.h (86%)
 rename llvm/include/{ => llvm}/Support/SlowOperationInformer.h (93%)
 rename llvm/include/{ => llvm}/Support/SystemUtils.h (97%)
 rename llvm/include/{ => llvm}/Support/ThreadSupport-NoSupport.h (91%)
 rename llvm/include/{ => llvm}/Support/ThreadSupport-PThreads.h (91%)
 rename llvm/include/{ => llvm}/Support/ThreadSupport.h.in (93%)
 rename llvm/include/{ => llvm}/Support/Timer.h (97%)
 rename llvm/include/{ => llvm}/Support/TypeInfo.h (92%)
 rename llvm/include/{ => llvm}/Support/type_traits.h (97%)

diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index 603a7c520b68..86cf136939bc 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -8,7 +8,7 @@ dnl Quit if the source directory has already been configured.
 dnl NOTE: This relies upon undocumented autoconf behavior.
 if test ${srcdir} != "."
 then
-	if test -f ${srcdir}/include/Config/config.h
+	if test -f ${srcdir}/include/llvm/Config/config.h
 	then
 		AC_MSG_ERROR([Already configured in ${srcdir}])
 	fi
@@ -27,15 +27,15 @@ do
 done
 
 dnl Configure header files
-AC_CONFIG_HEADERS(include/Config/config.h)
+AC_CONFIG_HEADERS(include/llvm/Config/config.h)
 
 dnl Configure other output file
 AC_CONFIG_FILES(Makefile.config
- include/Support/DataTypes.h
- include/Support/ThreadSupport.h
- include/Support/hash_map
- include/Support/hash_set
- include/Support/iterator)
+ include/llvm/Support/DataTypes.h
+ include/llvm/Support/ThreadSupport.h
+ include/llvm/ADT/hash_map
+ include/llvm/ADT/hash_set
+ include/llvm/ADT/iterator)
 
 dnl Do special configuration of Makefiles
 AC_CONFIG_MAKEFILE(Makefile)
diff --git a/llvm/configure b/llvm/configure
index 325ed37404dd..3f7f65b0dbd0 100755
--- a/llvm/configure
+++ b/llvm/configure
@@ -1544,7 +1544,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 if test ${srcdir} != "."
 then
-	if test -f ${srcdir}/include/Config/config.h
+	if test -f ${srcdir}/include/llvm/Config/config.h
 	then
 		{ { echo "$as_me:$LINENO: error: Already configured in ${srcdir}" >&5
 echo "$as_me: error: Already configured in ${srcdir}" >&2;}
@@ -1566,10 +1566,10 @@ subdirs="$subdirs projects/${i}"
   fi
 done
 
-          ac_config_headers="$ac_config_headers include/Config/config.h"
+          ac_config_headers="$ac_config_headers include/llvm/Config/config.h"
 
 
-                                                            ac_config_files="$ac_config_files Makefile.config include/Support/DataTypes.h include/Support/ThreadSupport.h include/Support/hash_map include/Support/hash_set include/Support/iterator"
+                                                            ac_config_files="$ac_config_files Makefile.config include/llvm/Support/DataTypes.h include/llvm/Support/ThreadSupport.h include/llvm/ADT/hash_map include/llvm/ADT/hash_set include/llvm/ADT/iterator"
 
 
           ac_config_commands="$ac_config_commands Makefile"
@@ -24450,11 +24450,11 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile.config" ) CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
-  "include/Support/DataTypes.h" ) CONFIG_FILES="$CONFIG_FILES include/Support/DataTypes.h" ;;
-  "include/Support/ThreadSupport.h" ) CONFIG_FILES="$CONFIG_FILES include/Support/ThreadSupport.h" ;;
-  "include/Support/hash_map" ) CONFIG_FILES="$CONFIG_FILES include/Support/hash_map" ;;
-  "include/Support/hash_set" ) CONFIG_FILES="$CONFIG_FILES include/Support/hash_set" ;;
-  "include/Support/iterator" ) CONFIG_FILES="$CONFIG_FILES include/Support/iterator" ;;
+  "include/llvm/Support/DataTypes.h" ) CONFIG_FILES="$CONFIG_FILES include/llvm/Support/DataTypes.h" ;;
+  "include/llvm/Support/ThreadSupport.h" ) CONFIG_FILES="$CONFIG_FILES include/llvm/Support/ThreadSupport.h" ;;
+  "include/llvm/ADT/hash_map" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/hash_map" ;;
+  "include/llvm/ADT/hash_set" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/hash_set" ;;
+  "include/llvm/ADT/iterator" ) CONFIG_FILES="$CONFIG_FILES include/llvm/ADT/iterator" ;;
   "lib/System/platform" ) CONFIG_LINKS="$CONFIG_LINKS lib/System/platform:lib/System/$platform_type" ;;
   "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
   "Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
@@ -24507,7 +24507,7 @@ do
   "tools/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS tools/Makefile" ;;
   "utils/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS utils/Makefile" ;;
   "projects/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS projects/Makefile" ;;
-  "include/Config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/Config/config.h" ;;
+  "include/llvm/Config/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/llvm/Config/config.h" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
diff --git a/llvm/include/Support/BitSetVector.h b/llvm/include/llvm/ADT/BitSetVector.h
similarity index 98%
rename from llvm/include/Support/BitSetVector.h
rename to llvm/include/llvm/ADT/BitSetVector.h
index 276af0a68a68..73c5841ad6e1 100644
--- a/llvm/include/Support/BitSetVector.h
+++ b/llvm/include/llvm/ADT/BitSetVector.h
@@ -1,4 +1,4 @@
-//===-- BitVectorSet.h - A bit-vector representation of sets ----*- C++ -*-===//
+//===-- llvm/ADT/BitVectorSet.h - A bit-vector rep. of sets -----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -22,8 +22,8 @@
 // 
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_BITSETVECTOR_H
-#define SUPPORT_BITSETVECTOR_H
+#ifndef LLVM_ADT_BITSETVECTOR_H
+#define LLVM_ADT_BITSETVECTOR_H
 
 #include <bitset>
 #include <vector>
diff --git a/llvm/include/Support/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h
similarity index 94%
rename from llvm/include/Support/DenseMap.h
rename to llvm/include/llvm/ADT/DenseMap.h
index 4f6dc91bb63b..c141a6c6f46f 100644
--- a/llvm/include/Support/DenseMap.h
+++ b/llvm/include/llvm/ADT/DenseMap.h
@@ -1,4 +1,4 @@
-//===- DenseMap.h - A dense map implmentation -------------------*- C++ -*-===//
+//===- llvm/ADT/DenseMap.h - A dense map implmentation ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -17,8 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DENSEMAP_H
-#define SUPPORT_DENSEMAP_H
+#ifndef LLVM_ADT_DENSEMAP_H
+#define LLVM_ADT_DENSEMAP_H
 
 #include <vector>
 
diff --git a/llvm/include/Support/DepthFirstIterator.h b/llvm/include/llvm/ADT/DepthFirstIterator.h
similarity index 96%
rename from llvm/include/Support/DepthFirstIterator.h
rename to llvm/include/llvm/ADT/DepthFirstIterator.h
index c465f4e549eb..d18ca9d582ca 100644
--- a/llvm/include/Support/DepthFirstIterator.h
+++ b/llvm/include/llvm/ADT/DepthFirstIterator.h
@@ -1,4 +1,4 @@
-//===- Support/DepthFirstIterator.h - Depth First iterator ------*- C++ -*-===//
+//===- llvm/ADT/DepthFirstIterator.h - Depth First iterator -----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// This file builds on the Support/GraphTraits.h file to build generic depth
+// This file builds on the ADT/GraphTraits.h file to build generic depth
 // first graph iterator.  This file exposes the following functions/types:
 //
 // df_begin/df_end/df_iterator
@@ -30,11 +30,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DEPTHFIRSTITERATOR_H
-#define SUPPORT_DEPTHFIRSTITERATOR_H
+#ifndef LLVM_ADT_DEPTHFIRSTITERATOR_H
+#define LLVM_ADT_DEPTHFIRSTITERATOR_H
 
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 #include <set>
 
diff --git a/llvm/include/Support/EquivalenceClasses.h b/llvm/include/llvm/ADT/EquivalenceClasses.h
similarity index 96%
rename from llvm/include/Support/EquivalenceClasses.h
rename to llvm/include/llvm/ADT/EquivalenceClasses.h
index 127183614bea..cb4b8bcc32f8 100644
--- a/llvm/include/Support/EquivalenceClasses.h
+++ b/llvm/include/llvm/ADT/EquivalenceClasses.h
@@ -1,4 +1,4 @@
-//===-- Support/EquivalenceClasses.h ----------------------------*- C++ -*-===//
+//===-- llvm/ADT/EquivalenceClasses.h - Generic Equiv. Classes --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 // 
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_EQUIVALENCECLASSES_H
-#define SUPPORT_EQUIVALENCECLASSES_H
+#ifndef LLVM_ADT_EQUIVALENCECLASSES_H
+#define LLVM_ADT_EQUIVALENCECLASSES_H
 
 #include <map>
 #include <set>
diff --git a/llvm/include/Support/GraphTraits.h b/llvm/include/llvm/ADT/GraphTraits.h
similarity index 95%
rename from llvm/include/Support/GraphTraits.h
rename to llvm/include/llvm/ADT/GraphTraits.h
index 4ff74176a7a5..e5765bb713bf 100644
--- a/llvm/include/Support/GraphTraits.h
+++ b/llvm/include/llvm/ADT/GraphTraits.h
@@ -1,4 +1,4 @@
-//===-- Support/GraphTraits.h - Graph traits template -----------*- C++ -*-===//
+//===-- llvm/ADT/GraphTraits.h - Graph traits template ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_GRAPHTRAITS_H
-#define SUPPORT_GRAPHTRAITS_H
+#ifndef LLVM_ADT_GRAPHTRAITS_H
+#define LLVM_ADT_GRAPHTRAITS_H
 
 namespace llvm {
 
diff --git a/llvm/include/Support/HashExtras.h b/llvm/include/llvm/ADT/HashExtras.h
similarity index 87%
rename from llvm/include/Support/HashExtras.h
rename to llvm/include/llvm/ADT/HashExtras.h
index 67f65b5f3ac0..f82115a07c5e 100644
--- a/llvm/include/Support/HashExtras.h
+++ b/llvm/include/llvm/ADT/HashExtras.h
@@ -1,4 +1,4 @@
-//===-- HashExtras.h - Useful functions for STL hash containers -*- C++ -*-===//
+//===-- llvm/ADT/HashExtras.h - Useful functions for STL hash ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,10 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_HASHEXTRAS_H
-#define SUPPORT_HASHEXTRAS_H
+#ifndef LLVM_ADT_HASHEXTRAS_H
+#define LLVM_ADT_HASHEXTRAS_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <string>
 
 // Cannot specialize hash template from outside of the std namespace.
diff --git a/llvm/include/Support/PostOrderIterator.h b/llvm/include/llvm/ADT/PostOrderIterator.h
similarity index 94%
rename from llvm/include/Support/PostOrderIterator.h
rename to llvm/include/llvm/ADT/PostOrderIterator.h
index d66c4b84c402..8ae46768b5a0 100644
--- a/llvm/include/Support/PostOrderIterator.h
+++ b/llvm/include/llvm/ADT/PostOrderIterator.h
@@ -1,4 +1,4 @@
-//===- Support/PostOrderIterator.h - Generic PostOrder iterator -*- C++ -*-===//
+//===- llvm/ADT/PostOrderIterator.h - PostOrder iterator --------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,17 +7,17 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// This file builds on the Support/GraphTraits.h file to build a generic graph
+// This file builds on the ADT/GraphTraits.h file to build a generic graph
 // post order iterator.  This should work over any graph type that has a
 // GraphTraits specialization.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_POSTORDERITERATOR_H
-#define SUPPORT_POSTORDERITERATOR_H
+#ifndef LLVM_ADT_POSTORDERITERATOR_H
+#define LLVM_ADT_POSTORDERITERATOR_H
 
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <stack>
 #include <set>
 
diff --git a/llvm/include/Support/SCCIterator.h b/llvm/include/llvm/ADT/SCCIterator.h
similarity index 96%
rename from llvm/include/Support/SCCIterator.h
rename to llvm/include/llvm/ADT/SCCIterator.h
index 2ea780ca92dc..9cccd123247f 100644
--- a/llvm/include/Support/SCCIterator.h
+++ b/llvm/include/llvm/ADT/SCCIterator.h
@@ -1,4 +1,4 @@
-//===-- Support/SCCIterator.h - SCC iterator --------------------*- C++ -*-===//
+//===-- Support/SCCIterator.h - Strongly Connected Comp. Iter. --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,7 @@
 // 
 //===----------------------------------------------------------------------===//
 //
-// This builds on the Support/GraphTraits.h file to find the strongly connected
+// This builds on the llvm/ADT/GraphTraits.h file to find the strongly connected
 // components (SCCs) of a graph in O(N+E) time using Tarjan's DFS algorithm.
 //
 // The SCC iterator has the important property that if a node in SCC S1 has an
@@ -18,11 +18,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SCCITERATOR_H
-#define SUPPORT_SCCITERATOR_H
+#ifndef LLVM_ADT_SCCITERATOR_H
+#define LLVM_ADT_SCCITERATOR_H
 
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 #include <map>
 
diff --git a/llvm/include/Support/STLExtras.h b/llvm/include/llvm/ADT/STLExtras.h
similarity index 98%
rename from llvm/include/Support/STLExtras.h
rename to llvm/include/llvm/ADT/STLExtras.h
index b6379d26232c..14b61bc916c3 100644
--- a/llvm/include/Support/STLExtras.h
+++ b/llvm/include/llvm/ADT/STLExtras.h
@@ -1,4 +1,4 @@
-//===- STLExtras.h - Useful functions when working with the STL -*- C++ -*-===//
+//===- llvm/ADT/STLExtras.h - Useful STL related functions ------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,12 +14,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_STLEXTRAS_H
-#define SUPPORT_STLEXTRAS_H
+#ifndef LLVM_ADT_STLEXTRAS_H
+#define LLVM_ADT_STLEXTRAS_H
 
 #include <functional>
 #include <utility> // for std::pair
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 
diff --git a/llvm/include/Support/SetOperations.h b/llvm/include/llvm/ADT/SetOperations.h
similarity index 94%
rename from llvm/include/Support/SetOperations.h
rename to llvm/include/llvm/ADT/SetOperations.h
index bb1e68e6b299..3be8babc38a3 100644
--- a/llvm/include/Support/SetOperations.h
+++ b/llvm/include/llvm/ADT/SetOperations.h
@@ -1,4 +1,4 @@
-//===-- Support/SetOperations.h - Generic Set Operations --------*- C++ -*-===//
+//===-- llvm/ADT/SetOperations.h - Generic Set Operations -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SETOPERATIONS_H
-#define SUPPORT_SETOPERATIONS_H
+#ifndef LLVM_ADT_SETOPERATIONS_H
+#define LLVM_ADT_SETOPERATIONS_H
 
 namespace llvm {
 
diff --git a/llvm/include/Support/SetVector.h b/llvm/include/llvm/ADT/SetVector.h
similarity index 96%
rename from llvm/include/Support/SetVector.h
rename to llvm/include/llvm/ADT/SetVector.h
index c72f49bce89e..6135e5328612 100644
--- a/llvm/include/Support/SetVector.h
+++ b/llvm/include/llvm/ADT/SetVector.h
@@ -1,4 +1,4 @@
-//===- SetVector.h - A set with insertion order iteration -------*- C++ -*-===//
+//===- llvm/ADT/SetVector.h - Set with insert order iteration ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SETVECTOR_H
-#define SUPPORT_SETVECTOR_H
+#ifndef LLVM_ADT_SETVECTOR_H
+#define LLVM_ADT_SETVECTOR_H
 
 #include <set>
 #include <vector>
diff --git a/llvm/include/Support/Statistic.h b/llvm/include/llvm/ADT/Statistic.h
similarity index 96%
rename from llvm/include/Support/Statistic.h
rename to llvm/include/llvm/ADT/Statistic.h
index 79d8f9d66ed7..31e9ae110d18 100644
--- a/llvm/include/Support/Statistic.h
+++ b/llvm/include/llvm/ADT/Statistic.h
@@ -1,4 +1,4 @@
-//===-- Support/Statistic.h - Easy way to expose stats ----------*- C++ -*-===//
+//===-- llvm/ADT/Statistic.h - Easy way to expose stats ---------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -21,8 +21,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_STATISTIC_H
-#define SUPPORT_STATISTIC_H
+#ifndef LLVM_ADT_STATISTIC_H
+#define LLVM_ADT_STATISTIC_H
 
 #include <iostream>
 
diff --git a/llvm/include/Support/StringExtras.h b/llvm/include/llvm/ADT/StringExtras.h
similarity index 95%
rename from llvm/include/Support/StringExtras.h
rename to llvm/include/llvm/ADT/StringExtras.h
index fcfa65f232f4..7e25f654d8fd 100644
--- a/llvm/include/Support/StringExtras.h
+++ b/llvm/include/llvm/ADT/StringExtras.h
@@ -1,4 +1,4 @@
-//===-- Support/StringExtras.h - Useful string functions --------*- C++ -*-===//
+//===-- llvm/ADT/StringExtras.h - Useful string functions -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_STRINGEXTRAS_H
-#define SUPPORT_STRINGEXTRAS_H
+#ifndef LLVM_ADT_STRINGEXTRAS_H
+#define LLVM_ADT_STRINGEXTRAS_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <cctype>
 #include <cstdio>
 #include <string>
diff --git a/llvm/include/Support/Tree.h b/llvm/include/llvm/ADT/Tree.h
similarity index 94%
rename from llvm/include/Support/Tree.h
rename to llvm/include/llvm/ADT/Tree.h
index 48ecf5b06dcf..3193eecba213 100644
--- a/llvm/include/Support/Tree.h
+++ b/llvm/include/llvm/ADT/Tree.h
@@ -1,4 +1,4 @@
-//===- Support/Tree.h - Generic n-way tree structure ------------*- C++ -*-===//
+//===- llvm/ADT/Tree.h - Generic n-way tree structure -----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_TREE_H
-#define SUPPORT_TREE_H
+#ifndef LLVM_ADT_TREE_H
+#define LLVM_ADT_TREE_H
 
 #include <vector>
 
diff --git a/llvm/include/Support/VectorExtras.h b/llvm/include/llvm/ADT/VectorExtras.h
similarity index 89%
rename from llvm/include/Support/VectorExtras.h
rename to llvm/include/llvm/ADT/VectorExtras.h
index cf7cf5d2ebb7..adc3ff720de7 100644
--- a/llvm/include/Support/VectorExtras.h
+++ b/llvm/include/llvm/ADT/VectorExtras.h
@@ -1,4 +1,4 @@
-//===-- VectorExtras.h - Helper functions for std::vector -------*- C++ -*-===//
+//===-- llvm/ADT/VectorExtras.h - Helpers for std::vector -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_VECTOREXTRAS_H
-#define SUPPORT_VECTOREXTRAS_H
+#ifndef LLVM_ADT_VECTOREXTRAS_H
+#define LLVM_ADT_VECTOREXTRAS_H
 
 #include <cstdarg>
 
diff --git a/llvm/include/Support/hash_map.in b/llvm/include/llvm/ADT/hash_map.in
similarity index 92%
rename from llvm/include/Support/hash_map.in
rename to llvm/include/llvm/ADT/hash_map.in
index 0253de788fe2..9f09ef2ba1cf 100644
--- a/llvm/include/Support/hash_map.in
+++ b/llvm/include/llvm/ADT/hash_map.in
@@ -1,4 +1,4 @@
-//===-- Support/hash_map - "Portable" wrapper around hash_map ---*- C++ -*-===//
+//===-- llvm/ADT/hash_map - "Portable" wrapper around hash_map --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_HASH_MAP
-#define SUPPORT_HASH_MAP
+#ifndef LLVM_ADT_HASH_MAP
+#define LLVM_ADT_HASH_MAP
 
 // Compiler Support Matrix
 //
@@ -61,6 +61,6 @@ using HASH_NAMESPACE::hash;
 // out specializations like stl_bvector.h, causing link conflicts.
 #include <vector>
 
-#include <Support/HashExtras.h>
+#include <llvm/ADT/HashExtras.h>
 
 #endif
diff --git a/llvm/include/Support/hash_set.in b/llvm/include/llvm/ADT/hash_set.in
similarity index 92%
rename from llvm/include/Support/hash_set.in
rename to llvm/include/llvm/ADT/hash_set.in
index 49c5d732e8f9..6da8c7f6a31a 100644
--- a/llvm/include/Support/hash_set.in
+++ b/llvm/include/llvm/ADT/hash_set.in
@@ -1,4 +1,4 @@
-//===-- Support/hash_set - "Portable" wrapper around hash_set ---*- C++ -*-===//
+//===-- llvm/ADT/hash_set - "Portable" wrapper around hash_set --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_HASH_SET
-#define SUPPORT_HASH_SET
+#ifndef LLVM_ADT_HASH_SET
+#define LLVM_ADT_HASH_SET
 
 // Compiler Support Matrix
 //
@@ -62,6 +62,6 @@ using HASH_NAMESPACE::hash;
 // out specializations like stl_bvector.h, causing link conflicts.
 #include <vector>
 
-#include <Support/HashExtras.h>
+#include <llvm/ADT/HashExtras.h>
 
 #endif
diff --git a/llvm/include/Support/ilist b/llvm/include/llvm/ADT/ilist
similarity index 99%
rename from llvm/include/Support/ilist
rename to llvm/include/llvm/ADT/ilist
index 9d9fdf0fdb8e..8c447c92e9ba 100644
--- a/llvm/include/Support/ilist
+++ b/llvm/include/llvm/ADT/ilist
@@ -1,4 +1,4 @@
-//===-- Support/ilist - Intrusive Linked List Template ----------*- C++ -*-===//
+//===-- llvm/ADT/ilist - Intrusive Linked List Template ---------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -35,10 +35,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_ILIST
-#define SUPPORT_ILIST
+#ifndef LLVM_ADT_ILIST
+#define LLVM_ADT_ILIST
 
-#include <Support/iterator>
+#include <llvm/ADT/iterator>
 #include <cassert>
 
 namespace llvm {
diff --git a/llvm/include/Support/iterator.in b/llvm/include/llvm/ADT/iterator.in
similarity index 94%
rename from llvm/include/Support/iterator.in
rename to llvm/include/llvm/ADT/iterator.in
index 93813e19859f..072beb71ee6b 100644
--- a/llvm/include/Support/iterator.in
+++ b/llvm/include/llvm/ADT/iterator.in
@@ -1,4 +1,4 @@
-//===-- Support/iterator - "Portable" wrapper around <iterator> -*- C++ -*-===//
+//===-- llvm/ADT/iterator - Portable wrapper around <iterator> --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -25,8 +25,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_ITERATOR
-#define SUPPORT_ITERATOR
+#ifndef LLVM_ADT_ITERATOR
+#define LLVM_ADT_ITERATOR
 
 #include <iterator>
 
diff --git a/llvm/include/llvm/Analysis/AliasSetTracker.h b/llvm/include/llvm/Analysis/AliasSetTracker.h
index 544b2b945dea..ddcbbb0ad531 100644
--- a/llvm/include/llvm/Analysis/AliasSetTracker.h
+++ b/llvm/include/llvm/Analysis/AliasSetTracker.h
@@ -18,9 +18,9 @@
 #define LLVM_ANALYSIS_ALIASSETTRACKER_H
 
 #include "llvm/Support/CallSite.h"
-#include "Support/iterator"
-#include "Support/hash_map"
-#include "Support/ilist"
+#include "llvm/ADT/iterator"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/ilist"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Analysis/CallGraph.h b/llvm/include/llvm/Analysis/CallGraph.h
index 86a2b53ad491..2a1f49c83c8f 100644
--- a/llvm/include/llvm/Analysis/CallGraph.h
+++ b/llvm/include/llvm/Analysis/CallGraph.h
@@ -51,8 +51,8 @@
 #ifndef LLVM_ANALYSIS_CALLGRAPH_H
 #define LLVM_ANALYSIS_CALLGRAPH_H
 
-#include "Support/GraphTraits.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/STLExtras.h"
 #include "llvm/Pass.h"
 
 namespace llvm {
diff --git a/llvm/include/llvm/Analysis/ConstantsScanner.h b/llvm/include/llvm/Analysis/ConstantsScanner.h
index e1533c35bb0c..48c0bd08759b 100644
--- a/llvm/include/llvm/Analysis/ConstantsScanner.h
+++ b/llvm/include/llvm/Analysis/ConstantsScanner.h
@@ -18,7 +18,7 @@
 
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Instruction.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h b/llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h
index 608cd198efc3..efb31517d123 100644
--- a/llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h
+++ b/llvm/include/llvm/Analysis/DataStructure/DSGraphTraits.h
@@ -17,9 +17,9 @@
 #define LLVM_ANALYSIS_DSGRAPHTRAITS_H
 
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
+#include "llvm/ADT/STLExtras.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Analysis/DataStructure/DSSupport.h b/llvm/include/llvm/Analysis/DataStructure/DSSupport.h
index 8cce6c98fde8..e5bf39047286 100644
--- a/llvm/include/llvm/Analysis/DataStructure/DSSupport.h
+++ b/llvm/include/llvm/Analysis/DataStructure/DSSupport.h
@@ -15,7 +15,7 @@
 #define LLVM_ANALYSIS_DSSUPPORT_H
 
 #include <functional>
-#include "Support/hash_set"
+#include "llvm/ADT/hash_set"
 #include "llvm/Support/CallSite.h"
 
 namespace llvm {
diff --git a/llvm/include/llvm/Analysis/DataStructure/DataStructure.h b/llvm/include/llvm/Analysis/DataStructure/DataStructure.h
index f210003213cc..9351ed4c988b 100644
--- a/llvm/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/llvm/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -16,7 +16,7 @@
 
 #include "llvm/Pass.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/hash_set"
+#include "llvm/ADT/hash_set"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Analysis/Interval.h b/llvm/include/llvm/Analysis/Interval.h
index 0d5912305bc5..448bcbc803a6 100644
--- a/llvm/include/llvm/Analysis/Interval.h
+++ b/llvm/include/llvm/Analysis/Interval.h
@@ -20,7 +20,7 @@
 #ifndef LLVM_INTERVAL_H
 #define LLVM_INTERVAL_H
 
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 #include <vector>
 #include <iosfwd>
 
diff --git a/llvm/include/llvm/Analysis/LoopInfo.h b/llvm/include/llvm/Analysis/LoopInfo.h
index 38f9264923b5..c5eec8342877 100644
--- a/llvm/include/llvm/Analysis/LoopInfo.h
+++ b/llvm/include/llvm/Analysis/LoopInfo.h
@@ -31,7 +31,7 @@
 #define LLVM_ANALYSIS_LOOP_INFO_H
 
 #include "llvm/Pass.h"
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/BasicBlock.h b/llvm/include/llvm/BasicBlock.h
index 27acba4c62a5..9c82da266ef4 100644
--- a/llvm/include/llvm/BasicBlock.h
+++ b/llvm/include/llvm/BasicBlock.h
@@ -30,7 +30,7 @@
 
 #include "llvm/Instruction.h"
 #include "llvm/SymbolTableListTraits.h"
-#include "Support/ilist"
+#include "llvm/ADT/ilist"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/CodeGen/MachineBasicBlock.h b/llvm/include/llvm/CodeGen/MachineBasicBlock.h
index fb037402903d..578f2b6c60fb 100644
--- a/llvm/include/llvm/CodeGen/MachineBasicBlock.h
+++ b/llvm/include/llvm/CodeGen/MachineBasicBlock.h
@@ -15,8 +15,8 @@
 #define LLVM_CODEGEN_MACHINEBASICBLOCK_H
 
 #include "llvm/CodeGen/MachineInstr.h"
-#include "Support/GraphTraits.h"
-#include "Support/ilist"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/ilist"
 #include <iosfwd>
 
 namespace llvm {
diff --git a/llvm/include/llvm/CodeGen/MachineCodeEmitter.h b/llvm/include/llvm/CodeGen/MachineCodeEmitter.h
index a46a2c5b59e8..0daab91faf76 100644
--- a/llvm/include/llvm/CodeGen/MachineCodeEmitter.h
+++ b/llvm/include/llvm/CodeGen/MachineCodeEmitter.h
@@ -18,7 +18,7 @@
 #define LLVM_CODEGEN_MACHINECODEEMITTER_H
 
 #include <string>
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/CodeGen/MachineFunction.h b/llvm/include/llvm/CodeGen/MachineFunction.h
index 69b86a640e89..4420c3b84e87 100644
--- a/llvm/include/llvm/CodeGen/MachineFunction.h
+++ b/llvm/include/llvm/CodeGen/MachineFunction.h
@@ -19,7 +19,7 @@
 #define LLVM_CODEGEN_MACHINEFUNCTION_H
 
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "Support/Annotation.h"
+#include "llvm/Support/Annotation.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/CodeGen/MachineInstr.h b/llvm/include/llvm/CodeGen/MachineInstr.h
index 3a01ab0fbfae..a9f1352b47b6 100644
--- a/llvm/include/llvm/CodeGen/MachineInstr.h
+++ b/llvm/include/llvm/CodeGen/MachineInstr.h
@@ -16,7 +16,7 @@
 #ifndef LLVM_CODEGEN_MACHINEINSTR_H
 #define LLVM_CODEGEN_MACHINEINSTR_H
 
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 #include <string>
 #include <vector>
 #include <cassert>
diff --git a/llvm/include/llvm/CodeGen/SSARegMap.h b/llvm/include/llvm/CodeGen/SSARegMap.h
index afed38a334e6..893b0c71670f 100644
--- a/llvm/include/llvm/CodeGen/SSARegMap.h
+++ b/llvm/include/llvm/CodeGen/SSARegMap.h
@@ -18,7 +18,7 @@
 #define LLVM_CODEGEN_SSAREGMAP_H
 
 #include "llvm/Target/MRegisterInfo.h"
-#include "Support/DenseMap.h"
+#include "llvm/ADT/DenseMap.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/CodeGen/SchedGraphCommon.h b/llvm/include/llvm/CodeGen/SchedGraphCommon.h
index fbb9dac7517d..167bfb0f2d2a 100644
--- a/llvm/include/llvm/CodeGen/SchedGraphCommon.h
+++ b/llvm/include/llvm/CodeGen/SchedGraphCommon.h
@@ -16,7 +16,7 @@
 #define LLVM_CODEGEN_SCHEDGRAPHCOMMON_H
 
 #include "llvm/Value.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 #include <vector>
 
 namespace llvm {
diff --git a/llvm/include/llvm/CodeGen/SelectionDAG.h b/llvm/include/llvm/CodeGen/SelectionDAG.h
index 4719bf9d21fd..796ee1353502 100644
--- a/llvm/include/llvm/CodeGen/SelectionDAG.h
+++ b/llvm/include/llvm/CodeGen/SelectionDAG.h
@@ -23,7 +23,7 @@
 #define LLVM_CODEGEN_SELECTIONDAG_H
 
 #include "llvm/CodeGen/ValueTypes.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <map>
 #include <vector>
 #include <cassert>
diff --git a/llvm/include/Config/alloca.h b/llvm/include/llvm/Config/alloca.h
similarity index 97%
rename from llvm/include/Config/alloca.h
rename to llvm/include/llvm/Config/alloca.h
index 297b56fa7c59..d2bbec6e5269 100644
--- a/llvm/include/Config/alloca.h
+++ b/llvm/include/llvm/Config/alloca.h
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_ALLOC_H
 #define _CONFIG_ALLOC_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 /*
  * This is a modified version of that suggested by the Autoconf manual.
diff --git a/llvm/include/Config/config.h.in b/llvm/include/llvm/Config/config.h.in
similarity index 98%
rename from llvm/include/Config/config.h.in
rename to llvm/include/llvm/Config/config.h.in
index fe0c77c8af36..c3046d22d00a 100644
--- a/llvm/include/Config/config.h.in
+++ b/llvm/include/llvm/Config/config.h.in
@@ -1,4 +1,4 @@
-/* include/Config/config.h.in.  Generated from autoconf/configure.ac by autoheader.  */
+/* include/llvm/Config/config.h.in.  Generated from autoconf/configure.ac by autoheader.  */
 
 /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
    systems. This function is required for `alloca.c' support on those systems.
diff --git a/llvm/include/Config/dlfcn.h b/llvm/include/llvm/Config/dlfcn.h
similarity index 94%
rename from llvm/include/Config/dlfcn.h
rename to llvm/include/llvm/Config/dlfcn.h
index c7ce5b19688c..bf51315ce25e 100644
--- a/llvm/include/Config/dlfcn.h
+++ b/llvm/include/llvm/Config/dlfcn.h
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_DLFCN_H
 #define _CONFIG_DLFCN_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
diff --git a/llvm/include/Config/fcntl.h b/llvm/include/llvm/Config/fcntl.h
similarity index 94%
rename from llvm/include/Config/fcntl.h
rename to llvm/include/llvm/Config/fcntl.h
index ed8a1c839b5e..2d0d44d95652 100644
--- a/llvm/include/Config/fcntl.h
+++ b/llvm/include/llvm/Config/fcntl.h
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_FCNTL_H
 #define _CONFIG_FCNTL_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
diff --git a/llvm/include/Config/limits.h b/llvm/include/llvm/Config/limits.h
similarity index 94%
rename from llvm/include/Config/limits.h
rename to llvm/include/llvm/Config/limits.h
index e5a787e5e140..1182d90b57bc 100644
--- a/llvm/include/Config/limits.h
+++ b/llvm/include/llvm/Config/limits.h
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_LIMITS_H
 #define _CONFIG_LIMITS_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
diff --git a/llvm/include/Config/malloc.h b/llvm/include/llvm/Config/malloc.h
similarity index 95%
rename from llvm/include/Config/malloc.h
rename to llvm/include/llvm/Config/malloc.h
index c78408a35981..7d16a406705f 100644
--- a/llvm/include/Config/malloc.h
+++ b/llvm/include/llvm/Config/malloc.h
@@ -15,7 +15,7 @@
 #ifndef _SUPPORT_MALLOC_H
 #define _SUPPORT_MALLOC_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
diff --git a/llvm/include/Config/memory.h b/llvm/include/llvm/Config/memory.h
similarity index 94%
rename from llvm/include/Config/memory.h
rename to llvm/include/llvm/Config/memory.h
index f75902b5bc51..f6fbbaf7359b 100644
--- a/llvm/include/Config/memory.h
+++ b/llvm/include/llvm/Config/memory.h
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_MEMORY_H
 #define _CONFIG_MEMORY_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
diff --git a/llvm/include/Config/pagesize.h b/llvm/include/llvm/Config/pagesize.h
similarity index 97%
rename from llvm/include/Config/pagesize.h
rename to llvm/include/llvm/Config/pagesize.h
index f37b29770d42..adbf87893ee6 100644
--- a/llvm/include/Config/pagesize.h
+++ b/llvm/include/llvm/Config/pagesize.h
@@ -12,7 +12,7 @@
 #ifndef PAGESIZE_H
 #define PAGESIZE_H
 
-#include "Config/unistd.h"
+#include "llvm/Config/unistd.h"
 #include <sys/param.h>
 
 namespace llvm {
diff --git a/llvm/include/Config/stdint.h b/llvm/include/llvm/Config/stdint.h
similarity index 94%
rename from llvm/include/Config/stdint.h
rename to llvm/include/llvm/Config/stdint.h
index a98961063ef2..44db789d0d31 100644
--- a/llvm/include/Config/stdint.h
+++ b/llvm/include/llvm/Config/stdint.h
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_STDINT_H
 #define _CONFIG_STDINT_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
diff --git a/llvm/include/Config/sys/mman.h b/llvm/include/llvm/Config/sys/mman.h
similarity index 96%
rename from llvm/include/Config/sys/mman.h
rename to llvm/include/llvm/Config/sys/mman.h
index 7f51e7fbfbea..92f394989afd 100644
--- a/llvm/include/Config/sys/mman.h
+++ b/llvm/include/llvm/Config/sys/mman.h
@@ -18,7 +18,7 @@
 #ifndef _CONFIG_MMAN_H
 #define _CONFIG_MMAN_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_SYS_MMAN_H) && !defined(_MSC_VER)
 #include <sys/mman.h>
diff --git a/llvm/include/Config/sys/resource.h b/llvm/include/llvm/Config/sys/resource.h
similarity index 90%
rename from llvm/include/Config/sys/resource.h
rename to llvm/include/llvm/Config/sys/resource.h
index 1f4cc694b291..11cb7709ca4c 100644
--- a/llvm/include/Config/sys/resource.h
+++ b/llvm/include/llvm/Config/sys/resource.h
@@ -16,7 +16,7 @@
 #ifndef _CONFIG_SYS_RESOURCE_H
 #define _CONFIG_SYS_RESOURCE_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_SYS_RESOURCE_H) && !defined(_MSC_VER)
 
@@ -25,9 +25,9 @@
  * stuff.  Some man pages say that you also need sys/time.h and unistd.h.
  * So, to be paranoid, we will try to include all three if possible.
  */
-#include "Config/sys/time.h"
+#include "llvm/Config/sys/time.h"
 #include <sys/resource.h>
-#include "Config/unistd.h"
+#include "llvm/Config/unistd.h"
 
 #endif
 
diff --git a/llvm/include/Config/sys/stat.h b/llvm/include/llvm/Config/sys/stat.h
similarity index 95%
rename from llvm/include/Config/sys/stat.h
rename to llvm/include/llvm/Config/sys/stat.h
index 9669bcf927b4..98b7f72e0a4e 100644
--- a/llvm/include/Config/sys/stat.h
+++ b/llvm/include/llvm/Config/sys/stat.h
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_SYS_STAT_H
 #define _CONFIG_SYS_STAT_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
diff --git a/llvm/include/Config/sys/time.h b/llvm/include/llvm/Config/sys/time.h
similarity index 95%
rename from llvm/include/Config/sys/time.h
rename to llvm/include/llvm/Config/sys/time.h
index 3e0ea1e81099..f5ca3961f25e 100644
--- a/llvm/include/Config/sys/time.h
+++ b/llvm/include/llvm/Config/sys/time.h
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_SYS_TIME_H
 #define _CONFIG_SYS_TIME_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_SYS_TIME_H) && !defined(_MSC_VER)
 #include <sys/time.h>
diff --git a/llvm/include/Config/sys/types.h b/llvm/include/llvm/Config/sys/types.h
similarity index 95%
rename from llvm/include/Config/sys/types.h
rename to llvm/include/llvm/Config/sys/types.h
index f0a7abec3556..fd6becd38f06 100644
--- a/llvm/include/Config/sys/types.h
+++ b/llvm/include/llvm/Config/sys/types.h
@@ -15,7 +15,7 @@
 #ifndef _CONFIG_SYS_TYPES_H
 #define _CONFIG_SYS_TYPES_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/llvm/include/Config/sys/wait.h b/llvm/include/llvm/Config/sys/wait.h
similarity index 95%
rename from llvm/include/Config/sys/wait.h
rename to llvm/include/llvm/Config/sys/wait.h
index b3db60e435c4..a1c70fbc6c41 100644
--- a/llvm/include/Config/sys/wait.h
+++ b/llvm/include/llvm/Config/sys/wait.h
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_SYS_WAIT_H
 #define _CONFIG_SYS_WAIT_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
diff --git a/llvm/include/Config/time.h b/llvm/include/llvm/Config/time.h
similarity index 96%
rename from llvm/include/Config/time.h
rename to llvm/include/llvm/Config/time.h
index b2f3e6ee053e..6d66efad1c69 100644
--- a/llvm/include/Config/time.h
+++ b/llvm/include/llvm/Config/time.h
@@ -24,7 +24,7 @@
 #ifndef _CONFIG_TIME_H
 #define _CONFIG_TIME_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_TIME_H
 #include <time.h>
diff --git a/llvm/include/Config/unistd.h b/llvm/include/llvm/Config/unistd.h
similarity index 95%
rename from llvm/include/Config/unistd.h
rename to llvm/include/llvm/Config/unistd.h
index 847db7a3c6ee..d6e90d0f9f46 100644
--- a/llvm/include/Config/unistd.h
+++ b/llvm/include/llvm/Config/unistd.h
@@ -14,7 +14,7 @@
 #ifndef _CONFIG_UNISTD_H
 #define _CONFIG_UNISTD_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #if defined(HAVE_UNISTD_H) && !defined(_MSC_VER)
 #include <unistd.h>
diff --git a/llvm/include/Config/windows.h b/llvm/include/llvm/Config/windows.h
similarity index 94%
rename from llvm/include/Config/windows.h
rename to llvm/include/llvm/Config/windows.h
index fded99fba8e2..ab443911a2ff 100644
--- a/llvm/include/Config/windows.h
+++ b/llvm/include/llvm/Config/windows.h
@@ -14,7 +14,7 @@
 #ifndef LLVM_CONFIG_WINDOWS_H
 #define LLVM_CONFIG_WINDOWS_H
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 
 #ifdef HAVE_WINDOWS_H
 #include <windows.h>
diff --git a/llvm/include/llvm/Constants.h b/llvm/include/llvm/Constants.h
index 5ef2cb013226..d0f577311ebb 100644
--- a/llvm/include/llvm/Constants.h
+++ b/llvm/include/llvm/Constants.h
@@ -17,7 +17,7 @@
 
 #include "llvm/Constant.h"
 #include "llvm/Type.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/ExecutionEngine/GenericValue.h b/llvm/include/llvm/ExecutionEngine/GenericValue.h
index 7cf1a7b3952b..6ea4366784b5 100644
--- a/llvm/include/llvm/ExecutionEngine/GenericValue.h
+++ b/llvm/include/llvm/ExecutionEngine/GenericValue.h
@@ -15,7 +15,7 @@
 #ifndef GENERIC_VALUE_H
 #define GENERIC_VALUE_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Function.h b/llvm/include/llvm/Function.h
index b363191b93cd..9e17f2602cce 100644
--- a/llvm/include/llvm/Function.h
+++ b/llvm/include/llvm/Function.h
@@ -21,7 +21,7 @@
 #include "llvm/GlobalValue.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Argument.h"
-#include "Support/Annotation.h"
+#include "llvm/Support/Annotation.h"
 
 namespace llvm {
 
diff --git a/llvm/include/Support/Annotation.h b/llvm/include/llvm/Support/Annotation.h
similarity index 98%
rename from llvm/include/Support/Annotation.h
rename to llvm/include/llvm/Support/Annotation.h
index efca20a3ec0e..4325836c2908 100644
--- a/llvm/include/Support/Annotation.h
+++ b/llvm/include/llvm/Support/Annotation.h
@@ -1,4 +1,4 @@
-//===-- Support/Annotation.h - Annotation classes ---------------*- C++ -*-===//
+//===-- llvm/Support/Annotation.h - Annotation classes ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_ANNOTATION_H
-#define SUPPORT_ANNOTATION_H
+#ifndef LLVM_SUPPORT_ANNOTATION_H
+#define LLVM_SUPPORT_ANNOTATION_H
 
 #include <string>
 #include <cassert>
diff --git a/llvm/include/llvm/Support/CFG.h b/llvm/include/llvm/Support/CFG.h
index a20265cd0c40..badb846bac3d 100644
--- a/llvm/include/llvm/Support/CFG.h
+++ b/llvm/include/llvm/Support/CFG.h
@@ -15,10 +15,10 @@
 #ifndef LLVM_SUPPORT_CFG_H
 #define LLVM_SUPPORT_CFG_H
 
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 #include "llvm/Function.h"
 #include "llvm/InstrTypes.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 
diff --git a/llvm/include/Support/Casting.h b/llvm/include/llvm/Support/Casting.h
similarity index 98%
rename from llvm/include/Support/Casting.h
rename to llvm/include/llvm/Support/Casting.h
index abc80aac7af4..d18975486571 100644
--- a/llvm/include/Support/Casting.h
+++ b/llvm/include/llvm/Support/Casting.h
@@ -1,4 +1,4 @@
-//===-- Support/Casting.h - Allow flexible, checked, casts ------*- C++ -*-===//
+//===-- llvm/Support/Casting.h - Allow flexible, checked, casts -*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_CASTING_H
-#define SUPPORT_CASTING_H
+#ifndef LLVM_SUPPORT_CASTING_H
+#define LLVM_SUPPORT_CASTING_H
 
 namespace llvm {
 
diff --git a/llvm/include/Support/CommandLine.h b/llvm/include/llvm/Support/CommandLine.h
similarity index 99%
rename from llvm/include/Support/CommandLine.h
rename to llvm/include/llvm/Support/CommandLine.h
index 053b823669e3..2c38e0aac065 100644
--- a/llvm/include/Support/CommandLine.h
+++ b/llvm/include/llvm/Support/CommandLine.h
@@ -1,4 +1,4 @@
-//===- Support/CommandLine.h - Flexible Command line parser -----*- C++ -*-===//
+//===- llvm/Support/CommandLine.h - Command line handler --------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -17,10 +17,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_COMMANDLINE_H
-#define SUPPORT_COMMANDLINE_H
+#ifndef LLVM_SUPPORT_COMMANDLINE_H
+#define LLVM_SUPPORT_COMMANDLINE_H
 
-#include "Support/type_traits.h"
+#include "llvm/Support/type_traits.h"
 #include <string>
 #include <vector>
 #include <utility>
diff --git a/llvm/include/llvm/Support/ConstantRange.h b/llvm/include/llvm/Support/ConstantRange.h
index 30618a169213..0c8b3b6b4ccb 100644
--- a/llvm/include/llvm/Support/ConstantRange.h
+++ b/llvm/include/llvm/Support/ConstantRange.h
@@ -24,7 +24,7 @@
 #ifndef LLVM_SUPPORT_CONSTANT_RANGE_H
 #define LLVM_SUPPORT_CONSTANT_RANGE_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <iosfwd>
 
 namespace llvm {
diff --git a/llvm/include/Support/DOTGraphTraits.h b/llvm/include/llvm/Support/DOTGraphTraits.h
similarity index 96%
rename from llvm/include/Support/DOTGraphTraits.h
rename to llvm/include/llvm/Support/DOTGraphTraits.h
index 7dbc4ff0b656..b83b759f4073 100644
--- a/llvm/include/Support/DOTGraphTraits.h
+++ b/llvm/include/llvm/Support/DOTGraphTraits.h
@@ -1,4 +1,4 @@
-//===-- Support/DotGraphTraits.h - Customize .dot output --------*- C++ -*-===//
+//===-- llvm/Support/DotGraphTraits.h - Customize .dot output ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,8 +14,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DOTGRAPHTRAITS_H
-#define SUPPORT_DOTGRAPHTRAITS_H
+#ifndef LLVM_SUPPORT_DOTGRAPHTRAITS_H
+#define LLVM_SUPPORT_DOTGRAPHTRAITS_H
 
 #include <string>
 
diff --git a/llvm/include/Support/DataTypes.h.in b/llvm/include/llvm/Support/DataTypes.h.in
similarity index 100%
rename from llvm/include/Support/DataTypes.h.in
rename to llvm/include/llvm/Support/DataTypes.h.in
diff --git a/llvm/include/Support/Debug.h b/llvm/include/llvm/Support/Debug.h
similarity index 94%
rename from llvm/include/Support/Debug.h
rename to llvm/include/llvm/Support/Debug.h
index f0a1b3dc5bdf..263547c98046 100644
--- a/llvm/include/Support/Debug.h
+++ b/llvm/include/llvm/Support/Debug.h
@@ -1,4 +1,4 @@
-//===- Debug.h - An easy way to add debug output to your code ---*- C++ -*-===//
+//===- llvm/Support/Debug.h - Easy way to add debug output ------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -23,8 +23,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DEBUG_H
-#define SUPPORT_DEBUG_H
+#ifndef LLVM_SUPPORT_DEBUG_H
+#define LLVM_SUPPORT_DEBUG_H
 
 // Unsurprisingly, most users of this macro use std::cerr too.
 #include <iostream>
diff --git a/llvm/include/Support/DynamicLinker.h b/llvm/include/llvm/Support/DynamicLinker.h
similarity index 90%
rename from llvm/include/Support/DynamicLinker.h
rename to llvm/include/llvm/Support/DynamicLinker.h
index fec9a45296ce..4f0bb58cab17 100644
--- a/llvm/include/Support/DynamicLinker.h
+++ b/llvm/include/llvm/Support/DynamicLinker.h
@@ -1,4 +1,4 @@
-//===-- DynamicLinker.h - System-indep. DynamicLinker interface -*- C++ -*-===//
+//===-- llvm/Support/DynamicLinker.h - Portable Dynamic Linker --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_DYNAMICLINKER_H
-#define SUPPORT_DYNAMICLINKER_H
+#ifndef LLVM_SUPPORT_DYNAMICLINKER_H
+#define LLVM_SUPPORT_DYNAMICLINKER_H
 
 #include <string>
 
diff --git a/llvm/include/Support/ELF.h b/llvm/include/llvm/Support/ELF.h
similarity index 98%
rename from llvm/include/Support/ELF.h
rename to llvm/include/llvm/Support/ELF.h
index e4b87b902227..8d9f693cf6c8 100644
--- a/llvm/include/Support/ELF.h
+++ b/llvm/include/llvm/Support/ELF.h
@@ -1,4 +1,4 @@
-//===-- Support/ELF.h - ELF constants and data structures -------*- C++ -*-===//
+//===-- llvm/Support/ELF.h - ELF constants and data structures --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -18,7 +18,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/DataTypes.h"
+#ifndef LLVM_SUPPORT_ELF_H
+#define LLVM_SUPPORT_ELF_H
+
+#include "llvm/Support/DataTypes.h"
 #include <cstring>
 #include <cstdlib>
 
@@ -293,3 +296,5 @@ enum {
 } // end namespace ELF
 
 } // end namespace llvm
+
+#endif
diff --git a/llvm/include/Support/FileUtilities.h b/llvm/include/llvm/Support/FileUtilities.h
similarity index 97%
rename from llvm/include/Support/FileUtilities.h
rename to llvm/include/llvm/Support/FileUtilities.h
index 78983b8352ce..c9f52c324880 100644
--- a/llvm/include/Support/FileUtilities.h
+++ b/llvm/include/llvm/Support/FileUtilities.h
@@ -1,4 +1,4 @@
-//===- Support/FileUtilities.h - File System Utilities ----------*- C++ -*-===//
+//===- llvm/Support/FileUtilities.h - File System Utilities -----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_FILEUTILITIES_H
-#define SUPPORT_FILEUTILITIES_H
+#ifndef LLVM_SUPPORT_FILEUTILITIES_H
+#define LLVM_SUPPORT_FILEUTILITIES_H
 
 #include <string>
 
diff --git a/llvm/include/Support/GraphWriter.h b/llvm/include/llvm/Support/GraphWriter.h
similarity index 96%
rename from llvm/include/Support/GraphWriter.h
rename to llvm/include/llvm/Support/GraphWriter.h
index c6a5c3cdc94b..feb9900d3b8f 100644
--- a/llvm/include/Support/GraphWriter.h
+++ b/llvm/include/llvm/Support/GraphWriter.h
@@ -1,4 +1,4 @@
-//===-- Support/GraphWriter.h - Write a graph to a .dot file ----*- C++ -*-===//
+//===-- llvm/Support/GraphWriter.h - Write graph to a .dot file -*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -20,11 +20,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_GRAPHWRITER_H
-#define SUPPORT_GRAPHWRITER_H
+#ifndef LLVM_SUPPORT_GRAPHWRITER_H
+#define LLVM_SUPPORT_GRAPHWRITER_H
 
-#include "Support/DOTGraphTraits.h"
-#include "Support/GraphTraits.h"
+#include "llvm/Support/DOTGraphTraits.h"
+#include "llvm/ADT/GraphTraits.h"
 #include <vector>
 #include <iostream>
 
diff --git a/llvm/include/Support/LeakDetector.h b/llvm/include/llvm/Support/LeakDetector.h
similarity index 95%
rename from llvm/include/Support/LeakDetector.h
rename to llvm/include/llvm/Support/LeakDetector.h
index e2ce9c50beac..6ca5405bc436 100644
--- a/llvm/include/Support/LeakDetector.h
+++ b/llvm/include/llvm/Support/LeakDetector.h
@@ -1,4 +1,4 @@
-//===-- Support/LeakDetector.h - Provide simple leak detection --*- C++ -*-===//
+//===-- llvm/Support/LeakDetector.h - Provide leak detection ----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -19,8 +19,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_LEAKDETECTOR_H
-#define SUPPORT_LEAKDETECTOR_H
+#ifndef LLVM_SUPPORT_LEAKDETECTOR_H
+#define LLVM_SUPPORT_LEAKDETECTOR_H
 
 #include <string>
 
diff --git a/llvm/include/Support/MallocAllocator.h b/llvm/include/llvm/Support/MallocAllocator.h
similarity index 94%
rename from llvm/include/Support/MallocAllocator.h
rename to llvm/include/llvm/Support/MallocAllocator.h
index 3e3da4139c10..c17517e2a0c7 100644
--- a/llvm/include/Support/MallocAllocator.h
+++ b/llvm/include/llvm/Support/MallocAllocator.h
@@ -1,4 +1,4 @@
-//===-- Support/MallocAllocator.h - Allocator using malloc/free -*- C++ -*-===//
+//===-- llvm/Support/MallocAllocator.h --------------------------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -17,8 +17,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_MALLOCALLOCATOR_H
-#define SUPPORT_MALLOCALLOCATOR_H
+#ifndef LLVM_SUPPORT_MALLOCALLOCATOR_H
+#define LLVM_SUPPORT_MALLOCALLOCATOR_H
 
 #include <cstdlib>
 #include <memory>
diff --git a/llvm/include/llvm/Support/Mangler.h b/llvm/include/llvm/Support/Mangler.h
index 4043d85a7150..14d68b59d329 100644
--- a/llvm/include/llvm/Support/Mangler.h
+++ b/llvm/include/llvm/Support/Mangler.h
@@ -1,4 +1,4 @@
-//===-- Mangler.h - Self-contained llvm name mangler ------------*- C++ -*-===//
+//===-- llvm/Support/Mangler.h - Self-contained name mangler ----*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/include/Support/MathExtras.h b/llvm/include/llvm/Support/MathExtras.h
similarity index 87%
rename from llvm/include/Support/MathExtras.h
rename to llvm/include/llvm/Support/MathExtras.h
index c1384d3eff50..bfc175f2c1ff 100644
--- a/llvm/include/Support/MathExtras.h
+++ b/llvm/include/llvm/Support/MathExtras.h
@@ -1,4 +1,4 @@
-//===-- Support/MathExtras.h - Useful math functions ------------*- C++ -*-===//
+//===-- llvm/Support/MathExtras.h - Useful math functions -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,10 +11,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_MATHEXTRAS_H
-#define SUPPORT_MATHEXTRAS_H
+#ifndef LLVM_SUPPORT_MATHEXTRAS_H
+#define LLVM_SUPPORT_MATHEXTRAS_H
 
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Support/PassNameParser.h b/llvm/include/llvm/Support/PassNameParser.h
index 0ffcabad52ae..71ebe41a459a 100644
--- a/llvm/include/llvm/Support/PassNameParser.h
+++ b/llvm/include/llvm/Support/PassNameParser.h
@@ -23,7 +23,7 @@
 #ifndef LLVM_SUPPORT_PASS_NAME_PARSER_H
 #define LLVM_SUPPORT_PASS_NAME_PARSER_H
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Pass.h"
 #include <algorithm>
 #include <iostream>
diff --git a/llvm/include/Support/PluginLoader.h b/llvm/include/llvm/Support/PluginLoader.h
similarity index 86%
rename from llvm/include/Support/PluginLoader.h
rename to llvm/include/llvm/Support/PluginLoader.h
index 7410895c3afc..48f8a7d8dc21 100644
--- a/llvm/include/Support/PluginLoader.h
+++ b/llvm/include/llvm/Support/PluginLoader.h
@@ -1,4 +1,4 @@
-//===-- Support/PluginLoader.h - Provide -load option to tool ---*- C++ -*-===//
+//===-- llvm/Support/PluginLoader.h - Plugin Loader for Tools ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,10 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_PLUGINLOADER_H
-#define SUPPORT_PLUGINLOADER_H
+#ifndef LLVM_SUPPORT_PLUGINLOADER_H
+#define LLVM_SUPPORT_PLUGINLOADER_H
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 
 namespace llvm {
   struct PluginLoader {
diff --git a/llvm/include/Support/SlowOperationInformer.h b/llvm/include/llvm/Support/SlowOperationInformer.h
similarity index 93%
rename from llvm/include/Support/SlowOperationInformer.h
rename to llvm/include/llvm/Support/SlowOperationInformer.h
index 67edf7df42b5..896fd3fb0621 100644
--- a/llvm/include/Support/SlowOperationInformer.h
+++ b/llvm/include/llvm/Support/SlowOperationInformer.h
@@ -1,4 +1,4 @@
-//===- SlowOperationInformer.h - Keep the user informed ---------*- C++ -*-===//
+//===- llvm/Support/SlowOperationInformer.h - Keep user informed *- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -28,8 +28,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_SLOW_OPERATION_INFORMER_H
-#define SUPPORT_SLOW_OPERATION_INFORMER_H
+#ifndef LLVM_SUPPORT_SLOW_OPERATION_INFORMER_H
+#define LLVM_SUPPORT_SLOW_OPERATION_INFORMER_H
 
 #include <string>
 #include <cassert>
diff --git a/llvm/include/Support/SystemUtils.h b/llvm/include/llvm/Support/SystemUtils.h
similarity index 97%
rename from llvm/include/Support/SystemUtils.h
rename to llvm/include/llvm/Support/SystemUtils.h
index b8c130cc9748..aea7df80eba9 100644
--- a/llvm/include/Support/SystemUtils.h
+++ b/llvm/include/llvm/Support/SystemUtils.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SYSTEMUTILS_H
-#define SYSTEMUTILS_H
+#ifndef LLVM_SUPPORT_SYSTEMUTILS_H
+#define LLVM_SUPPORT_SYSTEMUTILS_H
 
 #include <string>
 
diff --git a/llvm/include/Support/ThreadSupport-NoSupport.h b/llvm/include/llvm/Support/ThreadSupport-NoSupport.h
similarity index 91%
rename from llvm/include/Support/ThreadSupport-NoSupport.h
rename to llvm/include/llvm/Support/ThreadSupport-NoSupport.h
index 5dc954efab1d..3602e21cea46 100644
--- a/llvm/include/Support/ThreadSupport-NoSupport.h
+++ b/llvm/include/llvm/Support/ThreadSupport-NoSupport.h
@@ -1,4 +1,4 @@
-//===-- Support/ThreadSupport-NoSupport.h - Generic impl --------*- C++ -*-===//
+//===-- llvm/Support/ThreadSupport-NoSupport.h - Generic Impl ---*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -16,7 +16,7 @@
 // Users should never #include this file directly!  As such, no include guards
 // are needed.
 
-#ifndef SUPPORT_THREADSUPPORT_H
+#ifndef LLVM_SUPPORT_THREADSUPPORT_H
 #error "Code should not #include Support/ThreadSupport-NoSupport.h directly!"
 #endif
 
diff --git a/llvm/include/Support/ThreadSupport-PThreads.h b/llvm/include/llvm/Support/ThreadSupport-PThreads.h
similarity index 91%
rename from llvm/include/Support/ThreadSupport-PThreads.h
rename to llvm/include/llvm/Support/ThreadSupport-PThreads.h
index 6bbe682c0896..1bd3f32a99e1 100644
--- a/llvm/include/Support/ThreadSupport-PThreads.h
+++ b/llvm/include/llvm/Support/ThreadSupport-PThreads.h
@@ -1,4 +1,4 @@
-//===-- Support/ThreadSupport-PThreads.h - PThreads support -----*- C++ -*-===//
+//===-- llvm/Support/ThreadSupport-PThreads.h - PThreads support *- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -15,7 +15,7 @@
 // Users should never #include this file directly!  As such, no include guards
 // are needed.
 
-#ifndef SUPPORT_THREADSUPPORT_H
+#ifndef LLVM_SUPPORT_THREADSUPPORT_H
 #error "Code should not #include Support/ThreadSupport/PThreads.h directly!"
 #endif
 
diff --git a/llvm/include/Support/ThreadSupport.h.in b/llvm/include/llvm/Support/ThreadSupport.h.in
similarity index 93%
rename from llvm/include/Support/ThreadSupport.h.in
rename to llvm/include/llvm/Support/ThreadSupport.h.in
index 470010219fc8..48428b8cdef8 100644
--- a/llvm/include/Support/ThreadSupport.h.in
+++ b/llvm/include/llvm/Support/ThreadSupport.h.in
@@ -18,9 +18,9 @@
 #define SUPPORT_THREADSUPPORT_H
 
 #if @HAVE_PTHREAD_MUTEX_LOCK@
-#include "Support/ThreadSupport-PThreads.h"
+#include "llvm/Support/ThreadSupport-PThreads.h"
 #else
-#include "Support/ThreadSupport-NoSupport.h"
+#include "llvm/Support/ThreadSupport-NoSupport.h"
 #endif // If no system support is available
 
 namespace llvm {
diff --git a/llvm/include/Support/Timer.h b/llvm/include/llvm/Support/Timer.h
similarity index 97%
rename from llvm/include/Support/Timer.h
rename to llvm/include/llvm/Support/Timer.h
index ac465bb95b2d..a31dd3d93cf6 100644
--- a/llvm/include/Support/Timer.h
+++ b/llvm/include/llvm/Support/Timer.h
@@ -1,4 +1,4 @@
-//===-- Support/Timer.h - Interval Timing Support ---------------*- C++ -*-===//
+//===-- llvm/Support/Timer.h - Interval Timing Support ----------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_TIMER_H
-#define SUPPORT_TIMER_H
+#ifndef LLVM_SUPPORT_TIMER_H
+#define LLVM_SUPPORT_TIMER_H
 
 #include <string>
 #include <vector>
diff --git a/llvm/include/llvm/Support/ToolRunner.h b/llvm/include/llvm/Support/ToolRunner.h
index bd085eab6d09..c5d89da46df2 100644
--- a/llvm/include/llvm/Support/ToolRunner.h
+++ b/llvm/include/llvm/Support/ToolRunner.h
@@ -1,4 +1,4 @@
-//===-- Support/ToolRunner.h ------------------------------------*- C++ -*-===//
+//===-- llvm/Support/ToolRunner.h -------------------------------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -14,10 +14,10 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef TOOLRUNNER_H
-#define TOOLRUNNER_H
+#ifndef LLVM_SUPPORT_TOOLRUNNER_H
+#define LLVM_SUPPORT_TOOLRUNNER_H
 
-#include "Support/SystemUtils.h"
+#include "llvm/Support/SystemUtils.h"
 #include <exception>
 #include <vector>
 
diff --git a/llvm/include/Support/TypeInfo.h b/llvm/include/llvm/Support/TypeInfo.h
similarity index 92%
rename from llvm/include/Support/TypeInfo.h
rename to llvm/include/llvm/Support/TypeInfo.h
index e23f906afa7f..54043af9defb 100644
--- a/llvm/include/Support/TypeInfo.h
+++ b/llvm/include/llvm/Support/TypeInfo.h
@@ -1,4 +1,4 @@
-//===- Support/TypeInfo.h - Support class for type_info objects -*- C++ -*-===//
+//===- llvm/Support/TypeInfo.h - Support for type_info objects -*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,8 +13,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_TYPEINFO_H
-#define SUPPORT_TYPEINFO_H
+#ifndef LLVM_SUPPORT_TYPEINFO_H
+#define LLVM_SUPPORT_TYPEINFO_H
 
 #include <typeinfo>
 
diff --git a/llvm/include/Support/type_traits.h b/llvm/include/llvm/Support/type_traits.h
similarity index 97%
rename from llvm/include/Support/type_traits.h
rename to llvm/include/llvm/Support/type_traits.h
index de932b28db84..36bbdb8ea42b 100644
--- a/llvm/include/Support/type_traits.h
+++ b/llvm/include/llvm/Support/type_traits.h
@@ -1,4 +1,4 @@
-//===- Support/type_traits.h - Simplfied type traits ------------*- C++ -*-===//
+//===- llvm/Support/type_traits.h - Simplfied type traits -------*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
diff --git a/llvm/include/llvm/Target/TargetData.h b/llvm/include/llvm/Target/TargetData.h
index d354d2098ce4..9de9d7044a8c 100644
--- a/llvm/include/llvm/Target/TargetData.h
+++ b/llvm/include/llvm/Target/TargetData.h
@@ -21,7 +21,7 @@
 #define LLVM_TARGET_TARGETDATA_H
 
 #include "llvm/Pass.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <vector>
 #include <string>
 
diff --git a/llvm/include/llvm/Target/TargetInstrInfo.h b/llvm/include/llvm/Target/TargetInstrInfo.h
index bc25fa722b7d..d5f4b94d967a 100644
--- a/llvm/include/llvm/Target/TargetInstrInfo.h
+++ b/llvm/include/llvm/Target/TargetInstrInfo.h
@@ -15,7 +15,7 @@
 #define LLVM_TARGET_TARGETINSTRINFO_H
 
 #include "llvm/CodeGen/MachineBasicBlock.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <vector>
 #include <cassert>
 
diff --git a/llvm/include/llvm/Target/TargetMachineRegistry.h b/llvm/include/llvm/Target/TargetMachineRegistry.h
index 008b69c1db42..08ab56e10aec 100644
--- a/llvm/include/llvm/Target/TargetMachineRegistry.h
+++ b/llvm/include/llvm/Target/TargetMachineRegistry.h
@@ -17,7 +17,7 @@
 #ifndef LLVM_TARGET_TARGETMACHINEREGISTRY_H
 #define LLVM_TARGET_TARGETMACHINEREGISTRY_H
 
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 
 namespace llvm {
   class Module;
diff --git a/llvm/include/llvm/Target/TargetSchedInfo.h b/llvm/include/llvm/Target/TargetSchedInfo.h
index b7bd81f35a6b..f2a3560496cd 100644
--- a/llvm/include/llvm/Target/TargetSchedInfo.h
+++ b/llvm/include/llvm/Target/TargetSchedInfo.h
@@ -17,7 +17,7 @@
 #define LLVM_TARGET_TARGETSCHEDINFO_H
 
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <string>
 
 namespace llvm {
diff --git a/llvm/include/llvm/Type.h b/llvm/include/llvm/Type.h
index fcaa9f566905..dbc7881eb1fd 100644
--- a/llvm/include/llvm/Type.h
+++ b/llvm/include/llvm/Type.h
@@ -35,9 +35,9 @@
 #define LLVM_TYPE_H
 
 #include "AbstractTypeUser.h"
-#include "Support/Casting.h"
-#include "Support/GraphTraits.h"
-#include "Support/iterator"
+#include "llvm/Support/Casting.h"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 
 namespace llvm {
diff --git a/llvm/include/llvm/Use.h b/llvm/include/llvm/Use.h
index fb5eafb7122c..03afc24580f8 100644
--- a/llvm/include/llvm/Use.h
+++ b/llvm/include/llvm/Use.h
@@ -16,7 +16,7 @@
 #ifndef LLVM_USE_H
 #define LLVM_USE_H
 
-#include "Support/ilist"
+#include "llvm/ADT/ilist"
 
 namespace llvm {
 
diff --git a/llvm/include/llvm/Value.h b/llvm/include/llvm/Value.h
index f5381efd0d75..2b10a841a019 100644
--- a/llvm/include/llvm/Value.h
+++ b/llvm/include/llvm/Value.h
@@ -19,7 +19,7 @@
 
 #include "llvm/AbstractTypeUser.h"
 #include "llvm/Use.h"
-#include "Support/Casting.h"
+#include "llvm/Support/Casting.h"
 #include <string>
 
 namespace llvm {
diff --git a/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp b/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
index b4a183d1c40f..af0a25a409df 100644
--- a/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
+++ b/llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
@@ -24,7 +24,7 @@
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 #include <set>
 
diff --git a/llvm/lib/Analysis/CFGPrinter.cpp b/llvm/lib/Analysis/CFGPrinter.cpp
index 9eaaec690b8d..88f9843c0be2 100644
--- a/llvm/lib/Analysis/CFGPrinter.cpp
+++ b/llvm/lib/Analysis/CFGPrinter.cpp
@@ -23,7 +23,7 @@
 #include "llvm/Analysis/CFGPrinter.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
-#include "Support/GraphWriter.h"
+#include "llvm/Support/GraphWriter.h"
 #include <sstream>
 #include <fstream>
 using namespace llvm;
diff --git a/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp b/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
index 9f2124a1bb57..4bc6fafcf63d 100644
--- a/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
+++ b/llvm/lib/Analysis/DataStructure/BottomUpClosure.cpp
@@ -16,8 +16,8 @@
 
 #include "llvm/Analysis/DataStructure/DataStructure.h"
 #include "llvm/Module.h"
-#include "Support/Statistic.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Debug.h"
 #include "DSCallSiteIterator.h"
 using namespace llvm;
 
diff --git a/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp b/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp
index 589891f557f0..b2a0f4ba9b8e 100644
--- a/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp
+++ b/llvm/lib/Analysis/DataStructure/CompleteBottomUp.cpp
@@ -16,10 +16,10 @@
 #include "llvm/Analysis/DataStructure/DataStructure.h"
 #include "llvm/Module.h"
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/Debug.h"
-#include "Support/SCCIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/SCCIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Analysis/DataStructure/DataStructure.cpp b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
index 83aa890d96f6..de34265f2abc 100644
--- a/llvm/lib/Analysis/DataStructure/DataStructure.cpp
+++ b/llvm/lib/Analysis/DataStructure/DataStructure.cpp
@@ -18,12 +18,12 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/STLExtras.h"
-#include "Support/Statistic.h"
-#include "Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Timer.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp b/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp
index 6c2e5df3a774..f7a1ed9af3f8 100644
--- a/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp
+++ b/llvm/lib/Analysis/DataStructure/DataStructureOpt.cpp
@@ -16,7 +16,7 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Module.h"
 #include "llvm/Constant.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp b/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp
index 1bfe09aba515..7e3f85f3a690 100644
--- a/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp
+++ b/llvm/lib/Analysis/DataStructure/DataStructureStats.cpp
@@ -17,7 +17,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <vector>
 using namespace llvm;
 
diff --git a/llvm/lib/Analysis/DataStructure/DependenceGraph.h b/llvm/lib/Analysis/DataStructure/DependenceGraph.h
index 679ecd7d1357..520b0085282f 100644
--- a/llvm/lib/Analysis/DataStructure/DependenceGraph.h
+++ b/llvm/lib/Analysis/DataStructure/DependenceGraph.h
@@ -24,7 +24,7 @@
 #ifndef LLVM_ANALYSIS_DEPENDENCEGRAPH_H
 #define LLVM_ANALYSIS_DEPENDENCEGRAPH_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <cassert>
 #include <iosfwd>
 #include <utility>
diff --git a/llvm/lib/Analysis/DataStructure/GraphChecker.cpp b/llvm/lib/Analysis/DataStructure/GraphChecker.cpp
index 5cb37bb23e3e..8cef6b37bf1f 100644
--- a/llvm/lib/Analysis/DataStructure/GraphChecker.cpp
+++ b/llvm/lib/Analysis/DataStructure/GraphChecker.cpp
@@ -25,7 +25,7 @@
 
 #include "llvm/Analysis/DataStructure/DataStructure.h"
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Value.h"
 #include <iostream>
 #include <set>
diff --git a/llvm/lib/Analysis/DataStructure/IPModRef.cpp b/llvm/lib/Analysis/DataStructure/IPModRef.cpp
index bf1940ebe64b..ccc15f74e499 100644
--- a/llvm/lib/Analysis/DataStructure/IPModRef.cpp
+++ b/llvm/lib/Analysis/DataStructure/IPModRef.cpp
@@ -16,9 +16,9 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <vector>
 
 namespace llvm {
diff --git a/llvm/lib/Analysis/DataStructure/IPModRef.h b/llvm/lib/Analysis/DataStructure/IPModRef.h
index 57649da72391..4a825dbea3a5 100644
--- a/llvm/lib/Analysis/DataStructure/IPModRef.h
+++ b/llvm/lib/Analysis/DataStructure/IPModRef.h
@@ -47,8 +47,8 @@
 #define LLVM_ANALYSIS_IPMODREF_H
 
 #include "llvm/Pass.h"
-#include "Support/BitSetVector.h"
-#include "Support/hash_map"
+#include "llvm/ADT/BitSetVector.h"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 
diff --git a/llvm/lib/Analysis/DataStructure/Local.cpp b/llvm/lib/Analysis/DataStructure/Local.cpp
index 34c56dc2ea70..b21f2f10243c 100644
--- a/llvm/lib/Analysis/DataStructure/Local.cpp
+++ b/llvm/lib/Analysis/DataStructure/Local.cpp
@@ -21,9 +21,9 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/Timer.h"
 
 // FIXME: This should eventually be a FunctionPass that is automatically
 // aggregated into a Pass.
diff --git a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
index 7c39365d06cd..49b6425930d4 100644
--- a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
+++ b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.cpp
@@ -25,11 +25,11 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/CFG.h"
-#include "Support/SCCIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
-#include "Support/hash_map"
-#include "Support/hash_set"
+#include "llvm/ADT/SCCIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/hash_set"
 
 namespace llvm {
 
diff --git a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h
index 04d78dafff82..570a03b679df 100644
--- a/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h
+++ b/llvm/lib/Analysis/DataStructure/MemoryDepAnalysis.h
@@ -22,7 +22,7 @@
 
 #include "DependenceGraph.h"
 #include "llvm/Pass.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 
diff --git a/llvm/lib/Analysis/DataStructure/Parallelize.cpp b/llvm/lib/Analysis/DataStructure/Parallelize.cpp
index c944b8cc20dc..3dcb05ee064d 100644
--- a/llvm/lib/Analysis/DataStructure/Parallelize.cpp
+++ b/llvm/lib/Analysis/DataStructure/Parallelize.cpp
@@ -46,10 +46,10 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
-#include "Support/hash_set"
-#include "Support/hash_map"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/hash_set"
+#include "llvm/ADT/hash_map"
 #include <functional>
 #include <algorithm>
 using namespace llvm;
diff --git a/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h b/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h
index 5f7f7d581b9f..ec6f927a7e62 100644
--- a/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h
+++ b/llvm/lib/Analysis/DataStructure/PgmDependenceGraph.h
@@ -43,7 +43,7 @@
 /* #include "llvm/Analysis/PostDominators.h" -- see below */
 #include "llvm/Instruction.h"
 #include "llvm/Pass.h"
-#include "Support/iterator"
+#include "llvm/ADT/iterator"
 
 namespace llvm {
 
diff --git a/llvm/lib/Analysis/DataStructure/Printer.cpp b/llvm/lib/Analysis/DataStructure/Printer.cpp
index 24bf76837981..c951433f49a1 100644
--- a/llvm/lib/Analysis/DataStructure/Printer.cpp
+++ b/llvm/lib/Analysis/DataStructure/Printer.cpp
@@ -17,9 +17,9 @@
 #include "llvm/Module.h"
 #include "llvm/Constants.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/CommandLine.h"
-#include "Support/GraphWriter.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/GraphWriter.h"
+#include "llvm/ADT/Statistic.h"
 #include <fstream>
 #include <sstream>
 using namespace llvm;
diff --git a/llvm/lib/Analysis/DataStructure/Steensgaard.cpp b/llvm/lib/Analysis/DataStructure/Steensgaard.cpp
index 55a6deb048f0..deeb8b34509e 100644
--- a/llvm/lib/Analysis/DataStructure/Steensgaard.cpp
+++ b/llvm/lib/Analysis/DataStructure/Steensgaard.cpp
@@ -18,7 +18,7 @@
 #include "llvm/Analysis/DataStructure/DSGraph.h"
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Module.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp b/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
index 4635787a0413..1d861e8216ea 100644
--- a/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
+++ b/llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
@@ -18,8 +18,8 @@
 #include "llvm/Module.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Analysis/DataStructure/DSGraph.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Analysis/IPA/Andersens.cpp b/llvm/lib/Analysis/IPA/Andersens.cpp
index 54dfd7458d12..7901c91abb3b 100644
--- a/llvm/lib/Analysis/IPA/Andersens.cpp
+++ b/llvm/lib/Analysis/IPA/Andersens.cpp
@@ -58,8 +58,8 @@
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Analysis/AliasAnalysis.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Analysis/IPA/CallGraph.cpp b/llvm/lib/Analysis/IPA/CallGraph.cpp
index 8025ab2d9acd..75e068ba54c5 100644
--- a/llvm/lib/Analysis/IPA/CallGraph.cpp
+++ b/llvm/lib/Analysis/IPA/CallGraph.cpp
@@ -16,7 +16,7 @@
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 using namespace llvm;
 
diff --git a/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp b/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
index f4e2efbe1c1a..f7d7ab126a3f 100644
--- a/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
+++ b/llvm/lib/Analysis/IPA/CallGraphSCCPass.cpp
@@ -17,7 +17,7 @@
 
 #include "llvm/CallGraphSCCPass.h"
 #include "llvm/Analysis/CallGraph.h"
-#include "Support/SCCIterator.h"
+#include "llvm/ADT/SCCIterator.h"
 using namespace llvm;
 
 /// getAnalysisUsage - For this class, we declare that we require and preserve
diff --git a/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp b/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
index 52a83a1dfd55..23ee99aa59c6 100644
--- a/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
+++ b/llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
@@ -28,7 +28,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 static RegisterAnalysis<FindUnsafePointerTypes>
diff --git a/llvm/lib/Analysis/IPA/GlobalsModRef.cpp b/llvm/lib/Analysis/IPA/GlobalsModRef.cpp
index 219fdbf649b2..c1f15ed23855 100644
--- a/llvm/lib/Analysis/IPA/GlobalsModRef.cpp
+++ b/llvm/lib/Analysis/IPA/GlobalsModRef.cpp
@@ -22,9 +22,9 @@
 #include "llvm/Analysis/AliasAnalysis.h"
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
-#include "Support/SCCIterator.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/SCCIterator.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Analysis/IPA/PrintSCC.cpp b/llvm/lib/Analysis/IPA/PrintSCC.cpp
index 8911cc36e223..e4af831752c9 100644
--- a/llvm/lib/Analysis/IPA/PrintSCC.cpp
+++ b/llvm/lib/Analysis/IPA/PrintSCC.cpp
@@ -29,7 +29,7 @@
 #include "llvm/Module.h"
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Support/CFG.h"
-#include "Support/SCCIterator.h"
+#include "llvm/ADT/SCCIterator.h"
 #include <iostream>
 
 namespace llvm {
diff --git a/llvm/lib/Analysis/InstCount.cpp b/llvm/lib/Analysis/InstCount.cpp
index 9177e4480004..12d16b081e7b 100644
--- a/llvm/lib/Analysis/InstCount.cpp
+++ b/llvm/lib/Analysis/InstCount.cpp
@@ -14,7 +14,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Function.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Analysis/IntervalPartition.cpp b/llvm/lib/Analysis/IntervalPartition.cpp
index 12c196f2f70d..9253f721ab1e 100644
--- a/llvm/lib/Analysis/IntervalPartition.cpp
+++ b/llvm/lib/Analysis/IntervalPartition.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/IntervalIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Analysis/LoopInfo.cpp b/llvm/lib/Analysis/LoopInfo.cpp
index 131d02a32b8c..710f74afe2d5 100644
--- a/llvm/lib/Analysis/LoopInfo.cpp
+++ b/llvm/lib/Analysis/LoopInfo.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 #include <algorithm>
 #include <iostream>
 
diff --git a/llvm/lib/Analysis/PostDominators.cpp b/llvm/lib/Analysis/PostDominators.cpp
index ff202f0151dd..e5908c496b4c 100644
--- a/llvm/lib/Analysis/PostDominators.cpp
+++ b/llvm/lib/Analysis/PostDominators.cpp
@@ -14,8 +14,8 @@
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/SetOperations.h"
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp b/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
index 4ab56ce15698..cd3f57535598 100644
--- a/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
+++ b/llvm/lib/Analysis/ProfileInfoLoaderPass.cpp
@@ -17,7 +17,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Analysis/ProfileInfo.h"
 #include "llvm/Analysis/ProfileInfoLoader.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 
 using namespace llvm;
diff --git a/llvm/lib/Analysis/ScalarEvolution.cpp b/llvm/lib/Analysis/ScalarEvolution.cpp
index cac3b507ba10..efe4d92bff86 100644
--- a/llvm/lib/Analysis/ScalarEvolution.cpp
+++ b/llvm/lib/Analysis/ScalarEvolution.cpp
@@ -72,8 +72,8 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/ConstantRange.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
 #include <cmath>
 using namespace llvm;
 
diff --git a/llvm/lib/AsmParser/ParserInternals.h b/llvm/lib/AsmParser/ParserInternals.h
index 71876a55b465..9fdc8e66f8ba 100644
--- a/llvm/lib/AsmParser/ParserInternals.h
+++ b/llvm/lib/AsmParser/ParserInternals.h
@@ -20,7 +20,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Assembly/Parser.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 
 // Global variables exported from the lexer...
 extern std::FILE *llvmAsmin;
diff --git a/llvm/lib/AsmParser/llvmAsmParser.y b/llvm/lib/AsmParser/llvmAsmParser.y
index 8ba89bc879cc..1fd8782daea2 100644
--- a/llvm/lib/AsmParser/llvmAsmParser.y
+++ b/llvm/lib/AsmParser/llvmAsmParser.y
@@ -17,7 +17,7 @@
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 #include <list>
diff --git a/llvm/lib/Bytecode/Reader/ArchiveReader.cpp b/llvm/lib/Bytecode/Reader/ArchiveReader.cpp
index 1d8530fc7858..50e11d6ab583 100644
--- a/llvm/lib/Bytecode/Reader/ArchiveReader.cpp
+++ b/llvm/lib/Bytecode/Reader/ArchiveReader.cpp
@@ -18,7 +18,7 @@
 
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Module.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include <cstdlib>
 #include <iostream>
 using namespace llvm;
diff --git a/llvm/lib/Bytecode/Reader/Reader.cpp b/llvm/lib/Bytecode/Reader/Reader.cpp
index f0b39d45de94..39f238c9869c 100644
--- a/llvm/lib/Bytecode/Reader/Reader.cpp
+++ b/llvm/lib/Bytecode/Reader/Reader.cpp
@@ -24,7 +24,7 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Bytecode/Format.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <sstream>
 using namespace llvm;
 
@@ -428,14 +428,20 @@ Value * BytecodeReader::getValue(unsigned type, unsigned oNum, bool Create) {
 
   if (!Create) return 0;  // Do not create a placeholder?
 
+  // Did we already create a place holder?
   std::pair<unsigned,unsigned> KeyValue(type, oNum);
   ForwardReferenceMap::iterator I = ForwardReferences.lower_bound(KeyValue);
   if (I != ForwardReferences.end() && I->first == KeyValue)
     return I->second;   // We have already created this placeholder
 
-  Value *Val = new Argument(getType(type));
-  ForwardReferences.insert(I, std::make_pair(KeyValue, Val));
-  return Val;
+  // If the type exists (it should)
+  if (const Type* Ty = getType(type)) {
+    // Create the place holder
+    Value *Val = new Argument(Ty);
+    ForwardReferences.insert(I, std::make_pair(KeyValue, Val));
+    return Val;
+  }
+  throw "Can't create placeholder for value of type slot #" + utostr(type);
 }
 
 /// This is just like getValue, but when a compaction table is in use, it 
diff --git a/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp b/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
index 2930a42c63d9..383e53e9be4f 100644
--- a/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
+++ b/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp
@@ -17,9 +17,9 @@
 #include "Reader.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
-#include "Config/unistd.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/Config/unistd.h"
 #include <cerrno>
 using namespace llvm;
 
diff --git a/llvm/lib/Bytecode/Writer/SlotCalculator.cpp b/llvm/lib/Bytecode/Writer/SlotCalculator.cpp
index 2656edd8a540..d4145dbcdcab 100644
--- a/llvm/lib/Bytecode/Writer/SlotCalculator.cpp
+++ b/llvm/lib/Bytecode/Writer/SlotCalculator.cpp
@@ -23,8 +23,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Type.h"
 #include "llvm/Analysis/ConstantsScanner.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <functional>
 
diff --git a/llvm/lib/Bytecode/Writer/Writer.cpp b/llvm/lib/Bytecode/Writer/Writer.cpp
index 7db214860340..60a48cc26547 100644
--- a/llvm/lib/Bytecode/Writer/Writer.cpp
+++ b/llvm/lib/Bytecode/Writer/Writer.cpp
@@ -25,8 +25,8 @@
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/STLExtras.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/Statistic.h"
 #include <cstring>
 #include <algorithm>
 using namespace llvm;
diff --git a/llvm/lib/Bytecode/Writer/WriterInternals.h b/llvm/lib/Bytecode/Writer/WriterInternals.h
index e496da9ff8fe..8b5f99e94d35 100644
--- a/llvm/lib/Bytecode/Writer/WriterInternals.h
+++ b/llvm/lib/Bytecode/Writer/WriterInternals.h
@@ -23,7 +23,7 @@
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Bytecode/Format.h"
 #include "llvm/Instruction.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <string>
 #include <vector>
 
diff --git a/llvm/lib/CodeGen/BranchFolding.cpp b/llvm/lib/CodeGen/BranchFolding.cpp
index af2b72501733..cca9f93553c6 100644
--- a/llvm/lib/CodeGen/BranchFolding.cpp
+++ b/llvm/lib/CodeGen/BranchFolding.cpp
@@ -20,7 +20,7 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
index fc4d6a7164d3..69ecb90f31d7 100644
--- a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
+++ b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
@@ -20,7 +20,7 @@
 #include "../../Target/SparcV9/MachineCodeForInstruction.h"
 #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h"
 #include "../../Target/SparcV9/SparcV9InstrInfo.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <algorithm>
 #include <iostream>
 
diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
index e3b3cba5249d..00b48d537d3e 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
+++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.cpp
@@ -22,7 +22,7 @@
 #include "../../Target/SparcV9/MachineCodeForInstruction.h"
 #include "../../Target/SparcV9/SparcV9RegInfo.h"
 #include "../../Target/SparcV9/SparcV9InstrInfo.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 namespace llvm {
diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraph.h b/llvm/lib/CodeGen/InstrSched/SchedGraph.h
index e327598bd575..53ded6377d03 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedGraph.h
+++ b/llvm/lib/CodeGen/InstrSched/SchedGraph.h
@@ -22,8 +22,8 @@
 #include "llvm/CodeGen/SchedGraphCommon.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/hash_map"
-#include "Support/GraphTraits.h"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/GraphTraits.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp b/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp
index da4492f359d0..0ad5f5844e7e 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp
+++ b/llvm/lib/CodeGen/InstrSched/SchedGraphCommon.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/SchedGraphCommon.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 namespace llvm {
diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp b/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp
index 3c0e0b2c33cd..0aaece228d82 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp
+++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.cpp
@@ -21,7 +21,7 @@
 #include "../../Target/SparcV9/LiveVar/FunctionLiveVarInfo.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/CFG.h"
-#include "Support/PostOrderIterator.h"
+#include "llvm/ADT/PostOrderIterator.h"
 #include <iostream>
 
 namespace llvm {
diff --git a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
index 747046780660..dd807f788e3c 100644
--- a/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
+++ b/llvm/lib/CodeGen/InstrSched/SchedPriorities.h
@@ -23,7 +23,7 @@
 #include "SchedGraph.h"
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/Target/TargetSchedInfo.h"
-#include "Support/hash_set"
+#include "llvm/ADT/hash_set"
 #include <list>
 
 namespace llvm {
diff --git a/llvm/lib/CodeGen/LiveInterval.cpp b/llvm/lib/CodeGen/LiveInterval.cpp
index 6bd441f6431b..d63cfc60fba7 100644
--- a/llvm/lib/CodeGen/LiveInterval.cpp
+++ b/llvm/lib/CodeGen/LiveInterval.cpp
@@ -19,7 +19,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "LiveInterval.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 #include <map>
 using namespace llvm;
diff --git a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
index 3c234bbd0e12..95ed508fcb3e 100644
--- a/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
+++ b/llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
@@ -27,10 +27,10 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include "VirtRegMap.h"
 #include <cmath>
 
diff --git a/llvm/lib/CodeGen/LiveVariables.cpp b/llvm/lib/CodeGen/LiveVariables.cpp
index 630477d7b654..825b56d784af 100644
--- a/llvm/lib/CodeGen/LiveVariables.cpp
+++ b/llvm/lib/CodeGen/LiveVariables.cpp
@@ -31,8 +31,8 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 static RegisterAnalysis<LiveVariables> X("livevars", "Live Variable Analysis");
diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp b/llvm/lib/CodeGen/MachineBasicBlock.cpp
index 20390a2f50e3..f018f9f01f85 100644
--- a/llvm/lib/CodeGen/MachineBasicBlock.cpp
+++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp
@@ -17,7 +17,7 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include <iostream>
 using namespace llvm;
 
diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp
index 3478e30e1f79..e38e00603a4f 100644
--- a/llvm/lib/CodeGen/MachineFunction.cpp
+++ b/llvm/lib/CodeGen/MachineFunction.cpp
@@ -23,8 +23,8 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
-#include "Support/LeakDetector.h"
-#include "Support/GraphWriter.h"
+#include "llvm/Support/LeakDetector.h"
+#include "llvm/Support/GraphWriter.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>
diff --git a/llvm/lib/CodeGen/MachineInstr.cpp b/llvm/lib/CodeGen/MachineInstr.cpp
index 7c5a61ecd1dc..a4ae09a64904 100644
--- a/llvm/lib/CodeGen/MachineInstr.cpp
+++ b/llvm/lib/CodeGen/MachineInstr.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/MRegisterInfo.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include <iostream>
 
 using namespace llvm;
diff --git a/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp b/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp
index c57cb5a3bdb9..b8bbccf8be22 100644
--- a/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp
+++ b/llvm/lib/CodeGen/ModuloScheduling/MSSchedule.cpp
@@ -13,7 +13,7 @@
 #define DEBUG_TYPE "ModuloSched"
 
 #include "MSSchedule.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include "llvm/Target/TargetSchedInfo.h"
 
 using namespace llvm;
diff --git a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
index 6bee44d934ab..5bdcc9afcf28 100644
--- a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
+++ b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
@@ -16,7 +16,7 @@
 #include "../../Target/SparcV9/SparcV9RegisterInfo.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <cstdlib>
 using namespace llvm;
 
diff --git a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h
index 0dcbb496f19e..4ea572a380ba 100644
--- a/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h
+++ b/llvm/lib/CodeGen/ModuloScheduling/MSchedGraph.h
@@ -16,9 +16,9 @@
 
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/GraphTraits.h"
-#include "Support/STLExtras.h"
-#include "Support/iterator"
+#include "llvm/ADT/GraphTraits.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/iterator"
 #include <vector>
 
 namespace llvm {
diff --git a/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp b/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
index dadc38570c63..9ad1e4ce4bd6 100644
--- a/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
+++ b/llvm/lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
@@ -21,9 +21,9 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Target/TargetSchedInfo.h"
-#include "Support/Debug.h"
-#include "Support/GraphWriter.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/GraphWriter.h"
+#include "llvm/ADT/StringExtras.h"
 #include <cmath>
 #include <fstream>
 #include <sstream>
diff --git a/llvm/lib/CodeGen/PHIElimination.cpp b/llvm/lib/CodeGen/PHIElimination.cpp
index 4df9a92bb459..0010ccd7e66f 100644
--- a/llvm/lib/CodeGen/PHIElimination.cpp
+++ b/llvm/lib/CodeGen/PHIElimination.cpp
@@ -20,8 +20,8 @@
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/DenseMap.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/CodeGen/Passes.cpp b/llvm/lib/CodeGen/Passes.cpp
index 7233e81473b6..4d2f111b2ed7 100644
--- a/llvm/lib/CodeGen/Passes.cpp
+++ b/llvm/lib/CodeGen/Passes.cpp
@@ -13,7 +13,7 @@
 //===---------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/Passes.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 using namespace llvm;
 
diff --git a/llvm/lib/CodeGen/RegAllocIterativeScan.cpp b/llvm/lib/CodeGen/RegAllocIterativeScan.cpp
index ffeb68d9ddac..26fa7b7655b8 100644
--- a/llvm/lib/CodeGen/RegAllocIterativeScan.cpp
+++ b/llvm/lib/CodeGen/RegAllocIterativeScan.cpp
@@ -25,9 +25,9 @@
 #include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include "LiveIntervalAnalysis.h"
 #include "PhysRegTracker.h"
 #include "VirtRegMap.h"
diff --git a/llvm/lib/CodeGen/RegAllocLinearScan.cpp b/llvm/lib/CodeGen/RegAllocLinearScan.cpp
index 181f061986a9..8736a2367550 100644
--- a/llvm/lib/CodeGen/RegAllocLinearScan.cpp
+++ b/llvm/lib/CodeGen/RegAllocLinearScan.cpp
@@ -19,9 +19,9 @@
 #include "llvm/CodeGen/SSARegMap.h"
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include "LiveIntervalAnalysis.h"
 #include "PhysRegTracker.h"
 #include "VirtRegMap.h"
diff --git a/llvm/lib/CodeGen/RegAllocLocal.cpp b/llvm/lib/CodeGen/RegAllocLocal.cpp
index 482325fbff73..2cf8e6327e44 100644
--- a/llvm/lib/CodeGen/RegAllocLocal.cpp
+++ b/llvm/lib/CodeGen/RegAllocLocal.cpp
@@ -21,10 +21,10 @@
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/DenseMap.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/CodeGen/RegAllocSimple.cpp b/llvm/lib/CodeGen/RegAllocSimple.cpp
index 6f6c2c6352eb..ba05bd383097 100644
--- a/llvm/lib/CodeGen/RegAllocSimple.cpp
+++ b/llvm/lib/CodeGen/RegAllocSimple.cpp
@@ -22,9 +22,9 @@
 #include "llvm/CodeGen/MachineFrameInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
index 0268d4b01a5c..e3e79f01f5cd 100644
--- a/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
+++ b/llvm/lib/CodeGen/TwoAddressInstructionPass.cpp
@@ -37,9 +37,9 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/CodeGen/UnreachableBlockElim.cpp b/llvm/lib/CodeGen/UnreachableBlockElim.cpp
index 27355ec6d3da..0bde9ff23a2b 100644
--- a/llvm/lib/CodeGen/UnreachableBlockElim.cpp
+++ b/llvm/lib/CodeGen/UnreachableBlockElim.cpp
@@ -26,7 +26,7 @@
 #include "llvm/Function.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/CodeGen/VirtRegMap.cpp b/llvm/lib/CodeGen/VirtRegMap.cpp
index c235aada9f43..cffe77c51807 100644
--- a/llvm/lib/CodeGen/VirtRegMap.cpp
+++ b/llvm/lib/CodeGen/VirtRegMap.cpp
@@ -22,11 +22,11 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/DenseMap.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 
 using namespace llvm;
 
diff --git a/llvm/lib/CodeGen/VirtRegMap.h b/llvm/lib/CodeGen/VirtRegMap.h
index c76a222341e4..fb694d5e1a8a 100644
--- a/llvm/lib/CodeGen/VirtRegMap.h
+++ b/llvm/lib/CodeGen/VirtRegMap.h
@@ -20,7 +20,7 @@
 
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/SSARegMap.h"
-#include "Support/DenseMap.h"
+#include "llvm/ADT/DenseMap.h"
 #include <climits>
 #include <map>
 
diff --git a/llvm/lib/Debugger/Debugger.cpp b/llvm/lib/Debugger/Debugger.cpp
index 02c4a8a4916a..76cdfa20148b 100644
--- a/llvm/lib/Debugger/Debugger.cpp
+++ b/llvm/lib/Debugger/Debugger.cpp
@@ -16,7 +16,7 @@
 #include "llvm/ModuleProvider.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Debugger/InferiorProcess.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 /// Debugger constructor - Initialize the debugger to its initial, empty, state.
diff --git a/llvm/lib/Debugger/ProgramInfo.cpp b/llvm/lib/Debugger/ProgramInfo.cpp
index 8bb8738c6577..d6a4532b4f59 100644
--- a/llvm/lib/Debugger/ProgramInfo.cpp
+++ b/llvm/lib/Debugger/ProgramInfo.cpp
@@ -20,9 +20,9 @@
 #include "llvm/Module.h"
 #include "llvm/Debugger/SourceFile.h"
 #include "llvm/Debugger/SourceLanguage.h"
-#include "Support/FileUtilities.h"
-#include "Support/SlowOperationInformer.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/SlowOperationInformer.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 using namespace llvm;
diff --git a/llvm/lib/Debugger/SourceFile.cpp b/llvm/lib/Debugger/SourceFile.cpp
index 2eb3b5750b10..f0bd0d8a2212 100644
--- a/llvm/lib/Debugger/SourceFile.cpp
+++ b/llvm/lib/Debugger/SourceFile.cpp
@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Debugger/SourceFile.h"
-#include "Support/SlowOperationInformer.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/SlowOperationInformer.h"
+#include "llvm/Support/FileUtilities.h"
 #include <iostream>
 #include <cerrno>
 #include <fcntl.h>
diff --git a/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp b/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp
index 1cacb534a27d..437b21864edd 100644
--- a/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp
+++ b/llvm/lib/Debugger/UnixLocalInferiorProcess.cpp
@@ -32,8 +32,8 @@
 #include "llvm/CodeGen/IntrinsicLowering.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/StringExtras.h"
 #include <cerrno>
 #include <csignal>
 #include <unistd.h>        // Unix-specific debugger support
diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
index 105c0b8a1d93..b239cc2a53e7 100644
--- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -23,9 +23,9 @@
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/DynamicLinker.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
index 705fc16db8eb..5e1ae0629f8e 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/llvm/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -18,8 +18,8 @@
 #include "llvm/Instructions.h"
 #include "llvm/CodeGen/IntrinsicLowering.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/Statistic.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Debug.h"
 #include <cmath>  // For fmod
 using namespace llvm;
 
diff --git a/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 83da7551b0a2..def406a4b70c 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -23,7 +23,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <cmath>
 #include <csignal>
 #include <map>
diff --git a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
index 99e417c4a84a..d6e590d73574 100644
--- a/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
+++ b/llvm/lib/ExecutionEngine/Interpreter/Interpreter.h
@@ -20,7 +20,7 @@
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 #include <iostream>
 
 namespace llvm {
diff --git a/llvm/lib/ExecutionEngine/JIT/Emitter.cpp b/llvm/lib/ExecutionEngine/JIT/Emitter.cpp
index 7065c56a466f..5758ebc432a5 100644
--- a/llvm/lib/ExecutionEngine/JIT/Emitter.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/Emitter.cpp
@@ -20,9 +20,9 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/SystemUtils.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
index 8ed944715965..2eafb75cd0e8 100644
--- a/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
@@ -16,7 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "JIT.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <iostream>
 #include <sys/stat.h>
 using namespace llvm;
diff --git a/llvm/lib/ExecutionEngine/JIT/JIT.cpp b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
index 675ef479d118..311ec4b47db6 100644
--- a/llvm/lib/ExecutionEngine/JIT/JIT.cpp
+++ b/llvm/lib/ExecutionEngine/JIT/JIT.cpp
@@ -24,7 +24,7 @@
 #include "llvm/ExecutionEngine/GenericValue.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetJITInfo.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <iostream>
 
 using namespace llvm;
diff --git a/llvm/lib/Support/Annotation.cpp b/llvm/lib/Support/Annotation.cpp
index 45fd06f92e2f..c8cf8298b40b 100644
--- a/llvm/lib/Support/Annotation.cpp
+++ b/llvm/lib/Support/Annotation.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <map>
-#include "Support/Annotation.h"
+#include "llvm/Support/Annotation.h"
 using namespace llvm;
 
 Annotation::~Annotation() {}  // Designed to be subclassed
diff --git a/llvm/lib/Support/CommandLine.cpp b/llvm/lib/Support/CommandLine.cpp
index 3bc9cbf1ca8a..d60b464dd5ae 100644
--- a/llvm/lib/Support/CommandLine.cpp
+++ b/llvm/lib/Support/CommandLine.cpp
@@ -16,8 +16,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"
-#include "Support/CommandLine.h"
+#include "llvm/Config/config.h"
+#include "llvm/Support/CommandLine.h"
 #include <algorithm>
 #include <map>
 #include <set>
diff --git a/llvm/lib/Support/Debug.cpp b/llvm/lib/Support/Debug.cpp
index f1713429497f..a58716763a79 100644
--- a/llvm/lib/Support/Debug.cpp
+++ b/llvm/lib/Support/Debug.cpp
@@ -23,8 +23,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/Debug.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 bool llvm::DebugFlag;  // DebugFlag - Exported boolean set by the -debug option
diff --git a/llvm/lib/Support/DynamicLinker.cpp b/llvm/lib/Support/DynamicLinker.cpp
index 4ac58c1bbc0f..a6593034c7e6 100644
--- a/llvm/lib/Support/DynamicLinker.cpp
+++ b/llvm/lib/Support/DynamicLinker.cpp
@@ -18,9 +18,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/DynamicLinker.h"
-#include "Config/dlfcn.h"
-#include "Config/windows.h"
+#include "llvm/Support/DynamicLinker.h"
+#include "llvm/Config/dlfcn.h"
+#include "llvm/Config/windows.h"
 #include <cassert>
 #include <vector>
 using namespace llvm;
diff --git a/llvm/lib/Support/FileUtilities.cpp b/llvm/lib/Support/FileUtilities.cpp
index 09542c3fabb6..6829f155b8e2 100644
--- a/llvm/lib/Support/FileUtilities.cpp
+++ b/llvm/lib/Support/FileUtilities.cpp
@@ -12,14 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/FileUtilities.h"
-#include "Support/DataTypes.h"
-#include "Config/unistd.h"
-#include "Config/fcntl.h"
-#include "Config/sys/types.h"
-#include "Config/sys/stat.h"
-#include "Config/sys/mman.h"
-#include "Config/alloca.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/DataTypes.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/stat.h"
+#include "llvm/Config/sys/mman.h"
+#include "llvm/Config/alloca.h"
 #include <cerrno>
 #include <cstdio>
 #include <fstream>
diff --git a/llvm/lib/Support/IsInf.cpp b/llvm/lib/Support/IsInf.cpp
index 7fd857e931bd..c50eadff1796 100644
--- a/llvm/lib/Support/IsInf.cpp
+++ b/llvm/lib/Support/IsInf.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 #if HAVE_ISINF_IN_MATH_H
 # include <math.h>
 #elif HAVE_ISINF_IN_CMATH
diff --git a/llvm/lib/Support/IsNAN.cpp b/llvm/lib/Support/IsNAN.cpp
index ade6bf1dc86e..75c813f41aab 100644
--- a/llvm/lib/Support/IsNAN.cpp
+++ b/llvm/lib/Support/IsNAN.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"
+#include "llvm/Config/config.h"
 #if HAVE_ISNAN_IN_MATH_H
 # include <math.h>
 #elif HAVE_ISNAN_IN_CMATH
diff --git a/llvm/lib/Support/PluginLoader.cpp b/llvm/lib/Support/PluginLoader.cpp
index cbec6fa7d4d6..2c13d5781299 100644
--- a/llvm/lib/Support/PluginLoader.cpp
+++ b/llvm/lib/Support/PluginLoader.cpp
@@ -12,8 +12,8 @@
 //===----------------------------------------------------------------------===//
 
 #define DONT_GET_PLUGIN_LOADER_OPTION
-#include "Support/PluginLoader.h"
-#include "Support/DynamicLinker.h"
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/DynamicLinker.h"
 #include <iostream>
 using namespace llvm;
 
diff --git a/llvm/lib/Support/SlowOperationInformer.cpp b/llvm/lib/Support/SlowOperationInformer.cpp
index c245f3655c2a..43faaadaae1e 100644
--- a/llvm/lib/Support/SlowOperationInformer.cpp
+++ b/llvm/lib/Support/SlowOperationInformer.cpp
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/SlowOperationInformer.h"
-#include "Config/config.h"     // Get the signal handler return type
+#include "llvm/Support/SlowOperationInformer.h"
+#include "llvm/Config/config.h"     // Get the signal handler return type
 #include <iostream>
 #include <sstream>
 #include <signal.h>
diff --git a/llvm/lib/Support/Statistic.cpp b/llvm/lib/Support/Statistic.cpp
index 7fa7547fee33..f4d9c7b9e248 100644
--- a/llvm/lib/Support/Statistic.cpp
+++ b/llvm/lib/Support/Statistic.cpp
@@ -21,8 +21,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/Statistic.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/CommandLine.h"
 #include <sstream>
 #include <iostream>
 #include <algorithm>
diff --git a/llvm/lib/Support/StringExtras.cpp b/llvm/lib/Support/StringExtras.cpp
index 011ce280f050..e8d423a74da4 100644
--- a/llvm/lib/Support/StringExtras.cpp
+++ b/llvm/lib/Support/StringExtras.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 /// getToken - This function extracts one token from source, ignoring any
diff --git a/llvm/lib/Support/SystemUtils.cpp b/llvm/lib/Support/SystemUtils.cpp
index b831f4096d0f..3b529df79c75 100644
--- a/llvm/lib/Support/SystemUtils.cpp
+++ b/llvm/lib/Support/SystemUtils.cpp
@@ -13,15 +13,15 @@
 //===----------------------------------------------------------------------===//
 
 #define _POSIX_MAPPED_FILES
-#include "Support/SystemUtils.h"
-#include "Config/fcntl.h"
-#include "Config/pagesize.h"
-#include "Config/unistd.h"
-#include "Config/windows.h"
-#include "Config/sys/mman.h"
-#include "Config/sys/stat.h"
-#include "Config/sys/types.h"
-#include "Config/sys/wait.h"
+#include "llvm/Support/SystemUtils.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/pagesize.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/windows.h"
+#include "llvm/Config/sys/mman.h"
+#include "llvm/Config/sys/stat.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/wait.h"
 #include <algorithm>
 #include <cerrno>
 #include <cstdlib>
diff --git a/llvm/lib/Support/Timer.cpp b/llvm/lib/Support/Timer.cpp
index 52b616fa2c42..ff3fd6fefe02 100644
--- a/llvm/lib/Support/Timer.cpp
+++ b/llvm/lib/Support/Timer.cpp
@@ -11,18 +11,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/Timer.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
 #include <algorithm>
 #include <iostream>
 #include <functional>
 #include <fstream>
 #include <map>
-#include "Config/sys/resource.h"
-#include "Config/sys/time.h"
-#include "Config/unistd.h"
-#include "Config/malloc.h"
-#include "Config/windows.h"
+#include "llvm/Config/sys/resource.h"
+#include "llvm/Config/sys/time.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/malloc.h"
+#include "llvm/Config/windows.h"
 using namespace llvm;
 
 // GetLibSupportInfoOutputFile - Return a file stream to print our output on.
diff --git a/llvm/lib/Support/ToolRunner.cpp b/llvm/lib/Support/ToolRunner.cpp
index b694127e0766..3dc98451de59 100644
--- a/llvm/lib/Support/ToolRunner.cpp
+++ b/llvm/lib/Support/ToolRunner.cpp
@@ -13,9 +13,9 @@
 
 #define DEBUG_TYPE "toolrunner"
 #include "llvm/Support/ToolRunner.h"
-#include "Config/config.h"   // for HAVE_LINK_R
-#include "Support/Debug.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Config/config.h"   // for HAVE_LINK_R
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/FileUtilities.h"
 #include <fstream>
 #include <sstream>
 using namespace llvm;
diff --git a/llvm/lib/System/Unix/Path.cpp b/llvm/lib/System/Unix/Path.cpp
index 9a860a0672f2..49b2bf4afe1c 100644
--- a/llvm/lib/System/Unix/Path.cpp
+++ b/llvm/lib/System/Unix/Path.cpp
@@ -16,10 +16,10 @@
 //===          is guaranteed to work on *all* UNIX variants.
 //===----------------------------------------------------------------------===//
 
+#include <llvm/Config/config.h>
 #include "Unix.h"
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <Config/config.h>
 
 namespace llvm {
 using namespace sys;
diff --git a/llvm/lib/System/Unix/Program.cpp b/llvm/lib/System/Unix/Program.cpp
index ca8514dfa69b..b8ef55925d63 100644
--- a/llvm/lib/System/Unix/Program.cpp
+++ b/llvm/lib/System/Unix/Program.cpp
@@ -16,10 +16,10 @@
 //===          is guaranteed to work on *all* UNIX variants.
 //===----------------------------------------------------------------------===//
 
+#include <llvm/Config/config.h>
 #include "Unix.h"
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <Config/config.h>
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
diff --git a/llvm/lib/System/Unix/Unix.h b/llvm/lib/System/Unix/Unix.h
index aa6bfb1a78a5..b9eff46c46f1 100644
--- a/llvm/lib/System/Unix/Unix.h
+++ b/llvm/lib/System/Unix/Unix.h
@@ -16,7 +16,7 @@
 //===          is guaranteed to work on all UNIX variants.
 //===----------------------------------------------------------------------===//
 
-#include "Config/config.h"     // Get autoconf configuration settings
+#include "llvm/Config/config.h"     // Get autoconf configuration settings
 #include <unistd.h>
 #include <cstdlib>
 #include <cstdio>
diff --git a/llvm/lib/Target/CBackend/Writer.cpp b/llvm/lib/Target/CBackend/Writer.cpp
index b8208d4a4c70..45a771f9dfe2 100644
--- a/llvm/lib/Target/CBackend/Writer.cpp
+++ b/llvm/lib/Target/CBackend/Writer.cpp
@@ -32,9 +32,9 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/StringExtras.h"
-#include "Support/MathExtras.h"
-#include "Config/config.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/Config/config.h"
 #include <algorithm>
 #include <iostream>
 #include <sstream>
diff --git a/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
index 2358f1608a01..b30977b1a19d 100644
--- a/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPC32AsmPrinter.cpp
@@ -29,10 +29,10 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp b/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
index b8eb6b67142b..b08ce92d99fa 100644
--- a/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
+++ b/llvm/lib/Target/PowerPC/PPC32CodeEmitter.cpp
@@ -15,7 +15,7 @@
 #include "llvm/CodeGen/MachineCodeEmitter.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/Passes.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp b/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp
index 923e8d57bc0d..5ba7a5beeb2f 100644
--- a/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp
+++ b/llvm/lib/Target/PowerPC/PPC32ISelSimple.cpp
@@ -26,8 +26,8 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <vector>
 using namespace llvm;
 
diff --git a/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp b/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp
index bebb86884187..321a44939b67 100644
--- a/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp
+++ b/llvm/lib/Target/PowerPC/PPC32RegisterInfo.cpp
@@ -24,9 +24,9 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cstdlib>
 #include <iostream>
 using namespace llvm;
diff --git a/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp b/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp
index 74aaad5b154f..972fa01bb911 100644
--- a/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp
+++ b/llvm/lib/Target/PowerPC/PPC64AsmPrinter.cpp
@@ -25,11 +25,11 @@
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/MathExtras.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 
 namespace llvm {
diff --git a/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp b/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp
index 637e8565b251..107266ed62e1 100644
--- a/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp
+++ b/llvm/lib/Target/PowerPC/PPC64ISelSimple.cpp
@@ -26,8 +26,8 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <vector>
 using namespace llvm;
 
diff --git a/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp b/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp
index 774e661e62f7..1871c2e31526 100644
--- a/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp
+++ b/llvm/lib/Target/PowerPC/PPC64RegisterInfo.cpp
@@ -24,9 +24,9 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cstdlib>
 #include <iostream>
 using namespace llvm;
diff --git a/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp b/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
index e2456c9320df..6f7b597da3a7 100644
--- a/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
+++ b/llvm/lib/Target/PowerPC/PowerPCBranchSelector.cpp
@@ -22,7 +22,7 @@
 #include "PPC32InstrInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineFunction.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <map>
 using namespace llvm;
 
diff --git a/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp b/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp
index fa2455cc873e..f9f1cb4a531c 100644
--- a/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp
+++ b/llvm/lib/Target/PowerPC/PowerPCTargetMachine.cpp
@@ -25,7 +25,7 @@
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Target/TargetMachineRegistry.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 using namespace llvm;
 
diff --git a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
index 09f59542696b..785054c9f279 100644
--- a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
+++ b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.cpp
@@ -16,7 +16,7 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineBasicBlock.h"
 #include "llvm/Support/CFG.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/SetOperations.h"
 #include "../SparcV9Internals.h"
 #include <iostream>
 
diff --git a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h
index 7e5c72e3e464..e8486acf0784 100644
--- a/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h
+++ b/llvm/lib/Target/SparcV9/LiveVar/BBLiveVar.h
@@ -16,7 +16,7 @@
 #define LIVE_VAR_BB_H
 
 #include "llvm/CodeGen/ValueSet.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp
index 4a8ada912384..2883bf1c0925 100644
--- a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp
+++ b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.cpp
@@ -18,9 +18,9 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Support/CFG.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/SetOperations.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/SetOperations.h"
+#include "llvm/Support/CommandLine.h"
 #include "BBLiveVar.h"
 #include <iostream>
 
diff --git a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h
index 23a9d93a6eb7..02d5c0531bbd 100644
--- a/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h
+++ b/llvm/lib/Target/SparcV9/LiveVar/FunctionLiveVarInfo.h
@@ -35,7 +35,7 @@
 #ifndef FUNCTION_LIVE_VAR_INFO_H
 #define FUNCTION_LIVE_VAR_INFO_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include "llvm/Pass.h"
 #include "llvm/CodeGen/ValueSet.h"
 
diff --git a/llvm/lib/Target/SparcV9/MachineFunctionInfo.h b/llvm/lib/Target/SparcV9/MachineFunctionInfo.h
index 70bbccded589..3596bc2fa1be 100644
--- a/llvm/lib/Target/SparcV9/MachineFunctionInfo.h
+++ b/llvm/lib/Target/SparcV9/MachineFunctionInfo.h
@@ -20,8 +20,8 @@
 
 #include "MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineFunction.h"
-#include "Support/HashExtras.h"
-#include "Support/hash_set"
+#include "llvm/ADT/HashExtras.h"
+#include "llvm/ADT/hash_set"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SparcV9/MappingInfo.cpp b/llvm/lib/Target/SparcV9/MappingInfo.cpp
index e8c7581ed7bb..1a7212c9c09a 100644
--- a/llvm/lib/Target/SparcV9/MappingInfo.cpp
+++ b/llvm/lib/Target/SparcV9/MappingInfo.cpp
@@ -47,7 +47,7 @@
 #include "llvm/Module.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "MachineCodeForInstruction.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp b/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
index 9344e63f693d..3f57eccd89cf 100644
--- a/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
+++ b/llvm/lib/Target/SparcV9/RegAlloc/InterferenceGraph.cpp
@@ -14,7 +14,7 @@
 #include "IGNode.h"
 #include "InterferenceGraph.h"
 #include "RegAllocCommon.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 
diff --git a/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h b/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h
index 7a37596af00a..503eddac7f65 100644
--- a/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h
+++ b/llvm/lib/Target/SparcV9/RegAlloc/LiveRange.h
@@ -16,7 +16,7 @@
 #define LIVERANGE_H
 
 #include "llvm/Value.h"
-#include "Support/SetVector.h"
+#include "llvm/ADT/SetVector.h"
 #include <iostream>
 
 namespace llvm {
diff --git a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
index b2b49d546524..190e0c57af6d 100644
--- a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
+++ b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.cpp
@@ -21,7 +21,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "../SparcV9RegInfo.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/SetOperations.h"
 #include <iostream>
 
 namespace llvm {
diff --git a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
index 89a169ea933a..a6569146057f 100644
--- a/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
+++ b/llvm/lib/Target/SparcV9/RegAlloc/LiveRangeInfo.h
@@ -27,7 +27,7 @@
 #define LIVERANGEINFO_H
 
 #include "llvm/CodeGen/ValueSet.h"
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
index bbbaee8822c5..6a1710ef544d 100644
--- a/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
+++ b/llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
@@ -43,9 +43,9 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Target/TargetInstrInfo.h"
-#include "Support/CommandLine.h"
-#include "Support/SetOperations.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/SetOperations.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cmath>
 #include <iostream>
 
diff --git a/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp b/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
index 36deae09d82b..dbfc1e1e0ca1 100644
--- a/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9AsmPrinter.cpp
@@ -28,8 +28,8 @@
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/StringExtras.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/Statistic.h"
 #include "SparcV9Internals.h"
 #include "MachineFunctionInfo.h"
 #include <string>
diff --git a/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp b/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
index 0b4685c3a47d..1d4dbbd2bf76 100644
--- a/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9BurgISel.cpp
@@ -37,12 +37,12 @@
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Type.h"
-#include "Config/alloca.h"
-#include "Support/CommandLine.h"
-#include "Support/LeakDetector.h"
-#include "Support/MathExtras.h"
-#include "Support/STLExtras.h"
-#include "Support/hash_map"
+#include "llvm/Config/alloca.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/LeakDetector.h"
+#include "llvm/Support/MathExtras.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/hash_map"
 #include <algorithm>
 #include <cmath>
 #include <iostream>
diff --git a/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp b/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
index e870a15e86ac..b46d07eb7b08 100644
--- a/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9CodeEmitter.cpp
@@ -30,15 +30,15 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Debug.h"
-#include "Support/hash_set"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/hash_set"
+#include "llvm/ADT/Statistic.h"
 #include "SparcV9Internals.h"
 #include "SparcV9TargetMachine.h"
 #include "SparcV9RegInfo.h"
 #include "SparcV9CodeEmitter.h"
 #include "MachineFunctionInfo.h"
-#include "Config/alloca.h"
+#include "llvm/Config/alloca.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SparcV9/SparcV9Internals.h b/llvm/lib/Target/SparcV9/SparcV9Internals.h
index 3ac696401fc1..187d984a47e2 100644
--- a/llvm/lib/Target/SparcV9/SparcV9Internals.h
+++ b/llvm/lib/Target/SparcV9/SparcV9Internals.h
@@ -22,7 +22,7 @@
 #include "SparcV9RegInfo.h"
 #include "llvm/Type.h"
 #include "SparcV9RegClassInfo.h"
-#include "Config/sys/types.h"
+#include "llvm/Config/sys/types.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp b/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
index 0b7baabb8d34..778ced253210 100644
--- a/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9PeepholeOpts.cpp
@@ -19,7 +19,7 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/SparcV9/SparcV9RegInfo.h b/llvm/lib/Target/SparcV9/SparcV9RegInfo.h
index 6f0ef04ae346..25a09616d0c0 100644
--- a/llvm/lib/Target/SparcV9/SparcV9RegInfo.h
+++ b/llvm/lib/Target/SparcV9/SparcV9RegInfo.h
@@ -15,7 +15,7 @@
 #ifndef SPARCV9REGINFO_H
 #define SPARCV9REGINFO_H
 
-#include "Support/hash_map"
+#include "llvm/ADT/hash_map"
 #include <string>
 #include <cassert>
 
diff --git a/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp b/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
index 29a208c68c1a..1019c5619f5e 100644
--- a/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9TargetMachine.cpp
@@ -29,7 +29,7 @@
 #include "SparcV9Internals.h"
 #include "SparcV9TargetMachine.h"
 #include "SparcV9BurgISel.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 static const unsigned ImplicitRegUseList[] = { 0 }; /* not used yet */
diff --git a/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp b/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp
index 605cf061898a..6e53cbc3c30b 100644
--- a/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp
+++ b/llvm/lib/Target/SparcV9/SparcV9TmpInstr.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "SparcV9TmpInstr.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 
 namespace llvm {
 
diff --git a/llvm/lib/Target/TargetData.cpp b/llvm/lib/Target/TargetData.cpp
index 22dde60d8f61..a57d6ba2fba8 100644
--- a/llvm/lib/Target/TargetData.cpp
+++ b/llvm/lib/Target/TargetData.cpp
@@ -21,7 +21,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constants.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
-#include "Support/MathExtras.h"
+#include "llvm/Support/MathExtras.h"
 using namespace llvm;
 
 // Handle the Pass registration stuff necessary to use TargetData's.
diff --git a/llvm/lib/Target/TargetMachine.cpp b/llvm/lib/Target/TargetMachine.cpp
index ee8ef2e5ed6e..973165f186e3 100644
--- a/llvm/lib/Target/TargetMachine.cpp
+++ b/llvm/lib/Target/TargetMachine.cpp
@@ -14,7 +14,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Type.h"
 #include "llvm/CodeGen/IntrinsicLowering.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 //---------------------------------------------------------------------------
diff --git a/llvm/lib/Target/X86/X86AsmPrinter.cpp b/llvm/lib/Target/X86/X86AsmPrinter.cpp
index a0f046b62f8b..915ac3afd24d 100644
--- a/llvm/lib/Target/X86/X86AsmPrinter.cpp
+++ b/llvm/lib/Target/X86/X86AsmPrinter.cpp
@@ -29,9 +29,9 @@
 #include "llvm/CodeGen/ValueTypes.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/Mangler.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Target/X86/X86CodeEmitter.cpp b/llvm/lib/Target/X86/X86CodeEmitter.cpp
index 98e3bb4912af..69ab9ca928ee 100644
--- a/llvm/lib/Target/X86/X86CodeEmitter.cpp
+++ b/llvm/lib/Target/X86/X86CodeEmitter.cpp
@@ -21,9 +21,9 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Function.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Config/alloca.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Config/alloca.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Target/X86/X86FloatingPoint.cpp b/llvm/lib/Target/X86/X86FloatingPoint.cpp
index 8d7a8e72cc12..30763f0b986d 100644
--- a/llvm/lib/Target/X86/X86FloatingPoint.cpp
+++ b/llvm/lib/Target/X86/X86FloatingPoint.cpp
@@ -37,10 +37,10 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <set>
 using namespace llvm;
diff --git a/llvm/lib/Target/X86/X86ISelSimple.cpp b/llvm/lib/Target/X86/X86ISelSimple.cpp
index 19c61080db62..e9dbc4b314ad 100644
--- a/llvm/lib/Target/X86/X86ISelSimple.cpp
+++ b/llvm/lib/Target/X86/X86ISelSimple.cpp
@@ -28,7 +28,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Target/X86/X86PeepholeOpt.cpp b/llvm/lib/Target/X86/X86PeepholeOpt.cpp
index 82c622bff139..f03e339d2a6c 100644
--- a/llvm/lib/Target/X86/X86PeepholeOpt.cpp
+++ b/llvm/lib/Target/X86/X86PeepholeOpt.cpp
@@ -17,8 +17,8 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 
 using namespace llvm;
 
diff --git a/llvm/lib/Target/X86/X86RegisterInfo.cpp b/llvm/lib/Target/X86/X86RegisterInfo.cpp
index bac6138f03ae..d78110eb8f29 100644
--- a/llvm/lib/Target/X86/X86RegisterInfo.cpp
+++ b/llvm/lib/Target/X86/X86RegisterInfo.cpp
@@ -24,8 +24,8 @@
 #include "llvm/Target/TargetFrameInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
-#include "Support/CommandLine.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/STLExtras.h"
 #include <iostream>
 
 using namespace llvm;
diff --git a/llvm/lib/Target/X86/X86TargetMachine.cpp b/llvm/lib/Target/X86/X86TargetMachine.cpp
index 1a9e978dc4ad..06cbc49abf38 100644
--- a/llvm/lib/Target/X86/X86TargetMachine.cpp
+++ b/llvm/lib/Target/X86/X86TargetMachine.cpp
@@ -21,8 +21,8 @@
 #include "llvm/Target/TargetOptions.h"
 #include "llvm/Target/TargetMachineRegistry.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 X86VectorEnum llvm::X86Vector = NoSSE;
diff --git a/llvm/lib/Transforms/ExprTypeConvert.cpp b/llvm/lib/Transforms/ExprTypeConvert.cpp
index a657f023df49..779e23c19926 100644
--- a/llvm/lib/Transforms/ExprTypeConvert.cpp
+++ b/llvm/lib/Transforms/ExprTypeConvert.cpp
@@ -17,8 +17,8 @@
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
 #include "llvm/Analysis/Expressions.h"
-#include "Support/STLExtras.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
index fe945c408d68..a4086524e174 100644
--- a/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
+++ b/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
@@ -39,10 +39,10 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/ConstantMerge.cpp b/llvm/lib/Transforms/IPO/ConstantMerge.cpp
index 417cb1de4bb4..9f3c10959cc4 100644
--- a/llvm/lib/Transforms/IPO/ConstantMerge.cpp
+++ b/llvm/lib/Transforms/IPO/ConstantMerge.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
index 836e0b60912a..cde186c38d8c 100644
--- a/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
+++ b/llvm/lib/Transforms/IPO/DeadArgumentElimination.cpp
@@ -24,9 +24,9 @@
 #include "llvm/Constant.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/iterator"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/iterator"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp b/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
index cad90f56729e..e2d475daf9fe 100644
--- a/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
+++ b/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
@@ -17,7 +17,7 @@
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/IPO/FunctionResolution.cpp b/llvm/lib/Transforms/IPO/FunctionResolution.cpp
index 8403226ba38d..006d33cf5192 100644
--- a/llvm/lib/Transforms/IPO/FunctionResolution.cpp
+++ b/llvm/lib/Transforms/IPO/FunctionResolution.cpp
@@ -27,7 +27,7 @@
 #include "llvm/Support/CallSite.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/GlobalConstifier.cpp b/llvm/lib/Transforms/IPO/GlobalConstifier.cpp
index f9be0ad24601..dd9894cd19f3 100644
--- a/llvm/lib/Transforms/IPO/GlobalConstifier.cpp
+++ b/llvm/lib/Transforms/IPO/GlobalConstifier.cpp
@@ -23,8 +23,8 @@
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/GlobalDCE.cpp b/llvm/lib/Transforms/IPO/GlobalDCE.cpp
index e025813fd07c..ea5201cd232b 100644
--- a/llvm/lib/Transforms/IPO/GlobalDCE.cpp
+++ b/llvm/lib/Transforms/IPO/GlobalDCE.cpp
@@ -19,7 +19,7 @@
 #include "llvm/Constants.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp b/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
index 36ac2023c1d7..74a0a9b699ea 100644
--- a/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
+++ b/llvm/lib/Transforms/IPO/IPConstantPropagation.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Constants.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/IPO/Inliner.cpp b/llvm/lib/Transforms/IPO/Inliner.cpp
index f0cb03d7b17b..86d343af6a04 100644
--- a/llvm/lib/Transforms/IPO/Inliner.cpp
+++ b/llvm/lib/Transforms/IPO/Inliner.cpp
@@ -19,9 +19,9 @@
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Transforms/Utils/Cloning.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/Internalize.cpp b/llvm/lib/Transforms/IPO/Internalize.cpp
index 15c68cd893b1..c6b75b1be921 100644
--- a/llvm/lib/Transforms/IPO/Internalize.cpp
+++ b/llvm/lib/Transforms/IPO/Internalize.cpp
@@ -16,9 +16,9 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <fstream>
 #include <set>
 using namespace llvm;
diff --git a/llvm/lib/Transforms/IPO/LoopExtractor.cpp b/llvm/lib/Transforms/IPO/LoopExtractor.cpp
index a36c99632e65..e1ce290526c8 100644
--- a/llvm/lib/Transforms/IPO/LoopExtractor.cpp
+++ b/llvm/lib/Transforms/IPO/LoopExtractor.cpp
@@ -22,7 +22,7 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/FunctionUtils.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/IPO/LowerSetJmp.cpp b/llvm/lib/Transforms/IPO/LowerSetJmp.cpp
index f5c36d99ae42..ebd0500cba52 100644
--- a/llvm/lib/Transforms/IPO/LowerSetJmp.cpp
+++ b/llvm/lib/Transforms/IPO/LowerSetJmp.cpp
@@ -43,10 +43,10 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
-#include "Support/VectorExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/VectorExtras.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/IPO/PruneEH.cpp b/llvm/lib/Transforms/IPO/PruneEH.cpp
index fbb165948828..43b9acff731c 100644
--- a/llvm/lib/Transforms/IPO/PruneEH.cpp
+++ b/llvm/lib/Transforms/IPO/PruneEH.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Intrinsics.h"
 #include "llvm/Instructions.h"
 #include "llvm/Analysis/CallGraph.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/IPO/RaiseAllocations.cpp b/llvm/lib/Transforms/IPO/RaiseAllocations.cpp
index 36aef9c8eb69..42edb7e05de3 100644
--- a/llvm/lib/Transforms/IPO/RaiseAllocations.cpp
+++ b/llvm/lib/Transforms/IPO/RaiseAllocations.cpp
@@ -19,7 +19,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CallSite.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
index c60636cfb571..28830afba825 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/Graph.cpp
@@ -14,7 +14,7 @@
 
 #include "Graph.h"
 #include "llvm/Instructions.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 
 using std::vector;
diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
index 4e8419d96564..10ef440b4f8a 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/GraphAuxiliary.cpp
@@ -15,7 +15,7 @@
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 #include "Graph.h"
 
diff --git a/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp b/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
index 96d23f2253e3..56a20730b78a 100644
--- a/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
+++ b/llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Type.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include "../ProfilingUtils.h"
 
 namespace llvm {
diff --git a/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp b/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp
index 3953c28e52b7..60426c4e5af3 100644
--- a/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp
+++ b/llvm/lib/Transforms/Instrumentation/TraceBasicBlocks.cpp
@@ -20,7 +20,7 @@
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Instructions.h"
 #include "ProfilingUtils.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Instrumentation/TraceValues.cpp b/llvm/lib/Transforms/Instrumentation/TraceValues.cpp
index ae356a2f73df..1247dfcfbb55 100644
--- a/llvm/lib/Transforms/Instrumentation/TraceValues.cpp
+++ b/llvm/lib/Transforms/Instrumentation/TraceValues.cpp
@@ -19,8 +19,8 @@
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/CommandLine.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <sstream>
 using namespace llvm;
diff --git a/llvm/lib/Transforms/LevelRaise.cpp b/llvm/lib/Transforms/LevelRaise.cpp
index f470e504610f..cc4e69d9acd4 100644
--- a/llvm/lib/Transforms/LevelRaise.cpp
+++ b/llvm/lib/Transforms/LevelRaise.cpp
@@ -19,10 +19,10 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/ADCE.cpp b/llvm/lib/Transforms/Scalar/ADCE.cpp
index 04a641727267..5770bb692c23 100644
--- a/llvm/lib/Transforms/Scalar/ADCE.cpp
+++ b/llvm/lib/Transforms/Scalar/ADCE.cpp
@@ -23,10 +23,10 @@
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp b/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp
index a25ab0f12156..cadc6201708a 100644
--- a/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp
+++ b/llvm/lib/Transforms/Scalar/BasicBlockPlacement.cpp
@@ -30,7 +30,7 @@
 #include "llvm/Function.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/ConstantProp.cpp b/llvm/lib/Transforms/Scalar/ConstantProp.cpp
index 8be02476b9ce..2985ceba6381 100644
--- a/llvm/lib/Transforms/Scalar/ConstantProp.cpp
+++ b/llvm/lib/Transforms/Scalar/ConstantProp.cpp
@@ -24,7 +24,7 @@
 #include "llvm/Instruction.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp b/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
index 9738879e2828..53c56d2631ab 100644
--- a/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
+++ b/llvm/lib/Transforms/Scalar/CorrelatedExprs.cpp
@@ -38,9 +38,9 @@
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
 #include "llvm/Support/ConstantRange.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/DCE.cpp b/llvm/lib/Transforms/Scalar/DCE.cpp
index 570a5252d5a0..1a523cde4616 100644
--- a/llvm/lib/Transforms/Scalar/DCE.cpp
+++ b/llvm/lib/Transforms/Scalar/DCE.cpp
@@ -21,7 +21,7 @@
 #include "llvm/Instruction.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp b/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
index 40b5671e4c68..82dfebb5943e 100644
--- a/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
+++ b/llvm/lib/Transforms/Scalar/DeadStoreElimination.cpp
@@ -22,8 +22,8 @@
 #include "llvm/Analysis/AliasSetTracker.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/SetVector.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp b/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
index b1f8f2a01ab4..40e1be5d461d 100644
--- a/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
+++ b/llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
@@ -22,8 +22,8 @@
 #include "llvm/Instructions.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
-#include "Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/GCSE.cpp b/llvm/lib/Transforms/Scalar/GCSE.cpp
index a3452a3f8471..776ff6603aa4 100644
--- a/llvm/lib/Transforms/Scalar/GCSE.cpp
+++ b/llvm/lib/Transforms/Scalar/GCSE.cpp
@@ -22,8 +22,8 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/ValueNumbering.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
index 7c1f1161f59f..a2693534879b 100644
--- a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -46,8 +46,8 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
index 97cdc1196ea2..2340c49b5638 100644
--- a/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/Scalar/InstructionCombining.cpp
@@ -49,8 +49,8 @@
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/PatternMatch.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 using namespace llvm::PatternMatch;
diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp
index 792a672f04b6..9a104db00ad7 100644
--- a/llvm/lib/Transforms/Scalar/LICM.cpp
+++ b/llvm/lib/Transforms/Scalar/LICM.cpp
@@ -42,9 +42,9 @@
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/PromoteMemToReg.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/LoopSimplify.cpp b/llvm/lib/Transforms/Scalar/LoopSimplify.cpp
index 2a4d88b99ebf..81cf8e27780f 100644
--- a/llvm/lib/Transforms/Scalar/LoopSimplify.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopSimplify.cpp
@@ -41,10 +41,10 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/SetOperations.h"
-#include "Support/SetVector.h"
-#include "Support/Statistic.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/SetOperations.h"
+#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/LoopUnroll.cpp b/llvm/lib/Transforms/Scalar/LoopUnroll.cpp
index a9cced5ce141..d24b94fac850 100644
--- a/llvm/lib/Transforms/Scalar/LoopUnroll.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopUnroll.cpp
@@ -24,10 +24,10 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <cstdio>
 #include <set>
 using namespace llvm;
diff --git a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
index 83dc1836d6b4..73a99c22121b 100644
--- a/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
+++ b/llvm/lib/Transforms/Scalar/LoopUnswitch.cpp
@@ -35,8 +35,8 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/LowerAllocations.cpp b/llvm/lib/Transforms/Scalar/LowerAllocations.cpp
index a5197a0e01ce..f3c1a79052cb 100644
--- a/llvm/lib/Transforms/Scalar/LowerAllocations.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerAllocations.cpp
@@ -18,7 +18,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Constants.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/LowerInvoke.cpp b/llvm/lib/Transforms/Scalar/LowerInvoke.cpp
index 835a5ae78924..2c6cf7e91add 100644
--- a/llvm/lib/Transforms/Scalar/LowerInvoke.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerInvoke.cpp
@@ -41,8 +41,8 @@
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/Statistic.h"
-#include "Support/CommandLine.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/Support/CommandLine.h"
 #include <csetjmp>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/LowerPacked.cpp b/llvm/lib/Transforms/Scalar/LowerPacked.cpp
index 2d90ccb30082..7a42bf7fbae1 100644
--- a/llvm/lib/Transforms/Scalar/LowerPacked.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerPacked.cpp
@@ -19,7 +19,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <map>
 #include <iostream>
diff --git a/llvm/lib/Transforms/Scalar/LowerSelect.cpp b/llvm/lib/Transforms/Scalar/LowerSelect.cpp
index 647658e3a54a..f914e747a153 100644
--- a/llvm/lib/Transforms/Scalar/LowerSelect.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerSelect.cpp
@@ -23,7 +23,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Type.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/LowerSwitch.cpp b/llvm/lib/Transforms/Scalar/LowerSwitch.cpp
index 710188aa2b6b..24a2963c27ea 100644
--- a/llvm/lib/Transforms/Scalar/LowerSwitch.cpp
+++ b/llvm/lib/Transforms/Scalar/LowerSwitch.cpp
@@ -18,8 +18,8 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/Mem2Reg.cpp b/llvm/lib/Transforms/Scalar/Mem2Reg.cpp
index 12dd58252533..39400e72adcc 100644
--- a/llvm/lib/Transforms/Scalar/Mem2Reg.cpp
+++ b/llvm/lib/Transforms/Scalar/Mem2Reg.cpp
@@ -18,7 +18,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Function.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/PRE.cpp b/llvm/lib/Transforms/Scalar/PRE.cpp
index 38c5595ebc69..f8752336b2e1 100644
--- a/llvm/lib/Transforms/Scalar/PRE.cpp
+++ b/llvm/lib/Transforms/Scalar/PRE.cpp
@@ -29,11 +29,11 @@
 #include "llvm/Analysis/PostDominators.h"
 #include "llvm/Analysis/ValueNumbering.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/Debug.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/Statistic.h"
-#include "Support/hash_set"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/hash_set"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp b/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp
index 5227e7c61250..202ca74040a6 100644
--- a/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp
+++ b/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp
@@ -38,7 +38,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/Reassociate.cpp b/llvm/lib/Transforms/Scalar/Reassociate.cpp
index 6f843448892a..c74cf51ccc4d 100644
--- a/llvm/lib/Transforms/Scalar/Reassociate.cpp
+++ b/llvm/lib/Transforms/Scalar/Reassociate.cpp
@@ -30,9 +30,9 @@
 #include "llvm/Pass.h"
 #include "llvm/Constant.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
-#include "Support/PostOrderIterator.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/PostOrderIterator.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/SCCP.cpp b/llvm/lib/Transforms/Scalar/SCCP.cpp
index 1c39160d9bd8..497bf0ae9bb5 100644
--- a/llvm/lib/Transforms/Scalar/SCCP.cpp
+++ b/llvm/lib/Transforms/Scalar/SCCP.cpp
@@ -30,10 +30,10 @@
 #include "llvm/Type.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/Debug.h"
-#include "Support/hash_map"
-#include "Support/Statistic.h"
-#include "Support/STLExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/hash_map"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <set>
 using namespace llvm;
diff --git a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
index 32c9040c5b70..a0d5afe0ce56 100644
--- a/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
+++ b/llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
@@ -29,9 +29,9 @@
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/Utils/PromoteMemToReg.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
index 8e0f7d330736..0f9946e6ee6b 100644
--- a/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
@@ -23,7 +23,7 @@
 #include "llvm/Module.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Pass.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/lib/Transforms/Scalar/TailDuplication.cpp b/llvm/lib/Transforms/Scalar/TailDuplication.cpp
index 2a5a60628212..717a845765ac 100644
--- a/llvm/lib/Transforms/Scalar/TailDuplication.cpp
+++ b/llvm/lib/Transforms/Scalar/TailDuplication.cpp
@@ -26,9 +26,9 @@
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Transforms/Utils/Local.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/Statistic.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp b/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
index 0ca5562bae9c..758628ca64cd 100644
--- a/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
+++ b/llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
@@ -51,7 +51,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp b/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
index f5df6613345d..4a5c9d904bfc 100644
--- a/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
+++ b/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
@@ -22,7 +22,7 @@
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Statistic.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/lib/Transforms/Utils/CodeExtractor.cpp b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
index aabc587b56d1..5dd03bd9e75f 100644
--- a/llvm/lib/Transforms/Utils/CodeExtractor.cpp
+++ b/llvm/lib/Transforms/Utils/CodeExtractor.cpp
@@ -24,9 +24,9 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Transforms/Utils/BasicBlockUtils.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <set>
 using namespace llvm;
diff --git a/llvm/lib/Transforms/Utils/Local.cpp b/llvm/lib/Transforms/Utils/Local.cpp
index 41454ae0cb1e..fe27f308cf09 100644
--- a/llvm/lib/Transforms/Utils/Local.cpp
+++ b/llvm/lib/Transforms/Utils/Local.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/MathExtras.h"
+#include "llvm/Support/MathExtras.h"
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/Constants.h"
 #include "llvm/Instructions.h"
diff --git a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
index ced2315e0e7b..81f5cd3ed3ae 100644
--- a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
+++ b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
@@ -23,7 +23,7 @@
 #include "llvm/Constant.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/StableBasicBlockNumbering.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 /// isAllocaPromotable - Return true if this alloca is legal for promotion.
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index e2a5c8e36576..c93217333041 100644
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -17,7 +17,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 #include <algorithm>
 #include <functional>
 #include <set>
diff --git a/llvm/lib/VMCore/AsmWriter.cpp b/llvm/lib/VMCore/AsmWriter.cpp
index f70a82839aa1..0c4a1f78267c 100644
--- a/llvm/lib/VMCore/AsmWriter.cpp
+++ b/llvm/lib/VMCore/AsmWriter.cpp
@@ -26,8 +26,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
-#include "Support/StringExtras.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/VMCore/BasicBlock.cpp b/llvm/lib/VMCore/BasicBlock.cpp
index 005740904d73..32c86c4ce690 100644
--- a/llvm/lib/VMCore/BasicBlock.cpp
+++ b/llvm/lib/VMCore/BasicBlock.cpp
@@ -17,7 +17,7 @@
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/SymbolTable.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include "SymbolTableListTraitsImpl.h"
 #include <algorithm>
 using namespace llvm;
diff --git a/llvm/lib/VMCore/Constants.cpp b/llvm/lib/VMCore/Constants.cpp
index 8b28c0d3ff6c..77c34296aa81 100644
--- a/llvm/lib/VMCore/Constants.cpp
+++ b/llvm/lib/VMCore/Constants.cpp
@@ -18,7 +18,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <iostream>
 using namespace llvm;
diff --git a/llvm/lib/VMCore/Dominators.cpp b/llvm/lib/VMCore/Dominators.cpp
index b9eee7f4598c..14ec3ccd9f37 100644
--- a/llvm/lib/VMCore/Dominators.cpp
+++ b/llvm/lib/VMCore/Dominators.cpp
@@ -17,8 +17,8 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Assembly/Writer.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/SetOperations.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/SetOperations.h"
 #include <algorithm>
 using namespace llvm;
 
diff --git a/llvm/lib/VMCore/Function.cpp b/llvm/lib/VMCore/Function.cpp
index bf9c8b48bdee..e918fd5878a0 100644
--- a/llvm/lib/VMCore/Function.cpp
+++ b/llvm/lib/VMCore/Function.cpp
@@ -17,7 +17,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include "SymbolTableListTraitsImpl.h"
 using namespace llvm;
 
diff --git a/llvm/lib/VMCore/Globals.cpp b/llvm/lib/VMCore/Globals.cpp
index cfecbc91ce06..b84dbf7fd4a6 100644
--- a/llvm/lib/VMCore/Globals.cpp
+++ b/llvm/lib/VMCore/Globals.cpp
@@ -16,7 +16,7 @@
 #include "llvm/GlobalVariable.h"
 #include "llvm/Module.h"
 #include "llvm/SymbolTable.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/lib/VMCore/Instruction.cpp b/llvm/lib/VMCore/Instruction.cpp
index 1350f05b9b10..f54acf5f03ed 100644
--- a/llvm/lib/VMCore/Instruction.cpp
+++ b/llvm/lib/VMCore/Instruction.cpp
@@ -14,7 +14,7 @@
 #include "llvm/Function.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Type.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 using namespace llvm;
 
 void Instruction::init()
diff --git a/llvm/lib/VMCore/LeakDetector.cpp b/llvm/lib/VMCore/LeakDetector.cpp
index dbdb7dd70f29..807bd22b0755 100644
--- a/llvm/lib/VMCore/LeakDetector.cpp
+++ b/llvm/lib/VMCore/LeakDetector.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include "llvm/Value.h"
 #include <iostream>
 #include <set>
diff --git a/llvm/lib/VMCore/Mangler.cpp b/llvm/lib/VMCore/Mangler.cpp
index ed58da05c949..69bbe261fa50 100644
--- a/llvm/lib/VMCore/Mangler.cpp
+++ b/llvm/lib/VMCore/Mangler.cpp
@@ -14,7 +14,7 @@
 #include "llvm/Support/Mangler.h"
 #include "llvm/Module.h"
 #include "llvm/Type.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 using namespace llvm;
 
 static char HexDigit(int V) {
diff --git a/llvm/lib/VMCore/Module.cpp b/llvm/lib/VMCore/Module.cpp
index 125fd123f8cf..d8caf7f1175a 100644
--- a/llvm/lib/VMCore/Module.cpp
+++ b/llvm/lib/VMCore/Module.cpp
@@ -15,8 +15,8 @@
 #include "llvm/InstrTypes.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "Support/STLExtras.h"
-#include "Support/LeakDetector.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/LeakDetector.h"
 #include "SymbolTableListTraitsImpl.h"
 #include <algorithm>
 #include <cstdarg>
diff --git a/llvm/lib/VMCore/Pass.cpp b/llvm/lib/VMCore/Pass.cpp
index d6fe2fba41cd..5079b4ea65eb 100644
--- a/llvm/lib/VMCore/Pass.cpp
+++ b/llvm/lib/VMCore/Pass.cpp
@@ -17,8 +17,8 @@
 #include "PassManagerT.h"         // PassManagerT implementation
 #include "llvm/Module.h"
 #include "llvm/ModuleProvider.h"
-#include "Support/STLExtras.h"
-#include "Support/TypeInfo.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/Support/TypeInfo.h"
 #include <iostream>
 #include <set>
 using namespace llvm;
diff --git a/llvm/lib/VMCore/PassManagerT.h b/llvm/lib/VMCore/PassManagerT.h
index 6c60a2d022d9..95e0f563c947 100644
--- a/llvm/lib/VMCore/PassManagerT.h
+++ b/llvm/lib/VMCore/PassManagerT.h
@@ -23,9 +23,9 @@
 #define LLVM_PASSMANAGER_T_H
 
 #include "llvm/Pass.h"
-#include "Support/CommandLine.h"
-#include "Support/LeakDetector.h"
-#include "Support/Timer.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/LeakDetector.h"
+#include "llvm/Support/Timer.h"
 #include <algorithm>
 #include <iostream>
 
diff --git a/llvm/lib/VMCore/SymbolTable.cpp b/llvm/lib/VMCore/SymbolTable.cpp
index afbb0b1c21d8..e5191be198bd 100644
--- a/llvm/lib/VMCore/SymbolTable.cpp
+++ b/llvm/lib/VMCore/SymbolTable.cpp
@@ -15,7 +15,7 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <iostream>
 
diff --git a/llvm/lib/VMCore/Type.cpp b/llvm/lib/VMCore/Type.cpp
index bd0da45f460f..0c76d1604b86 100644
--- a/llvm/lib/VMCore/Type.cpp
+++ b/llvm/lib/VMCore/Type.cpp
@@ -15,9 +15,9 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Constants.h"
-#include "Support/DepthFirstIterator.h"
-#include "Support/StringExtras.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 using namespace llvm;
diff --git a/llvm/lib/VMCore/Value.cpp b/llvm/lib/VMCore/Value.cpp
index e41c7fd1366f..60be53db5b6a 100644
--- a/llvm/lib/VMCore/Value.cpp
+++ b/llvm/lib/VMCore/Value.cpp
@@ -16,7 +16,7 @@
 #include "llvm/DerivedTypes.h"
 #include "llvm/Constant.h"
 #include "llvm/GlobalValue.h"
-#include "Support/LeakDetector.h"
+#include "llvm/Support/LeakDetector.h"
 #include <algorithm>
 #include <iostream>
 using namespace llvm;
diff --git a/llvm/lib/VMCore/Verifier.cpp b/llvm/lib/VMCore/Verifier.cpp
index 9e99fe0136c3..18d933834838 100644
--- a/llvm/lib/VMCore/Verifier.cpp
+++ b/llvm/lib/VMCore/Verifier.cpp
@@ -53,7 +53,7 @@
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Support/InstVisitor.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 #include <iostream>
 #include <sstream>
diff --git a/llvm/projects/Stacker/lib/compiler/StackerParser.y b/llvm/projects/Stacker/lib/compiler/StackerParser.y
index 2256b30ccf78..40411d962804 100644
--- a/llvm/projects/Stacker/lib/compiler/StackerParser.y
+++ b/llvm/projects/Stacker/lib/compiler/StackerParser.y
@@ -16,8 +16,8 @@
 #include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
-#include "Support/STLExtras.h"
-#include "Support/DepthFirstIterator.h"
+#include "llvm/ADT/STLExtras.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 #include <list>
 #include <utility>
 #include <algorithm>
diff --git a/llvm/projects/Stacker/lib/runtime/Makefile b/llvm/projects/Stacker/lib/runtime/Makefile
index eaf1b4828709..5f149ad4321a 100644
--- a/llvm/projects/Stacker/lib/runtime/Makefile
+++ b/llvm/projects/Stacker/lib/runtime/Makefile
@@ -8,7 +8,8 @@ LEVEL=../../../..
 #
 # Give the name of a library.  This will build a dynamic version.
 #
-SHARED_LIBRARY=1
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
 LIBRARYNAME=stkr_runtime
 
 #
diff --git a/llvm/projects/Stacker/tools/stkrc/stkrc.cpp b/llvm/projects/Stacker/tools/stkrc/stkrc.cpp
index c5d92e6c2ef3..6006bb476e2a 100644
--- a/llvm/projects/Stacker/tools/stkrc/stkrc.cpp
+++ b/llvm/projects/Stacker/tools/stkrc/stkrc.cpp
@@ -21,7 +21,7 @@
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Analysis/Verifier.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>
diff --git a/llvm/projects/sample/lib/sample/sample.c b/llvm/projects/sample/lib/sample/sample.c
index bd78ed574656..631a48d1ad18 100644
--- a/llvm/projects/sample/lib/sample/sample.c
+++ b/llvm/projects/sample/lib/sample/sample.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 // LLVM Header File
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 // Header file global to this project
 #include "sample.h"
diff --git a/llvm/runtime/libtrace/tracelib.c b/llvm/runtime/libtrace/tracelib.c
index 5b4c7f68319b..9de5c296b48c 100644
--- a/llvm/runtime/libtrace/tracelib.c
+++ b/llvm/runtime/libtrace/tracelib.c
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "Support/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 /*===---------------------------------------------------------------------=====
  * HASH FUNCTIONS
diff --git a/llvm/tools/analyze/GraphPrinters.cpp b/llvm/tools/analyze/GraphPrinters.cpp
index fc74c480cf2f..1176a8df109d 100644
--- a/llvm/tools/analyze/GraphPrinters.cpp
+++ b/llvm/tools/analyze/GraphPrinters.cpp
@@ -14,7 +14,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/GraphWriter.h"
+#include "llvm/Support/GraphWriter.h"
 #include "llvm/Pass.h"
 #include "llvm/Value.h"
 #include "llvm/Analysis/CallGraph.h"
diff --git a/llvm/tools/analyze/analyze.cpp b/llvm/tools/analyze/analyze.cpp
index 0207b8c6e1a7..1542a1a068a1 100644
--- a/llvm/tools/analyze/analyze.cpp
+++ b/llvm/tools/analyze/analyze.cpp
@@ -24,8 +24,8 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/System/Signals.h"
-#include "Support/PluginLoader.h"
-#include "Support/Timer.h"
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/Timer.h"
 #include <algorithm>
 
 using namespace llvm;
diff --git a/llvm/tools/bugpoint/BugDriver.cpp b/llvm/tools/bugpoint/BugDriver.cpp
index 1826b7b780c1..6d13f9671181 100644
--- a/llvm/tools/bugpoint/BugDriver.cpp
+++ b/llvm/tools/bugpoint/BugDriver.cpp
@@ -20,8 +20,8 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Support/Linker.h"
 #include "llvm/Support/ToolRunner.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include <iostream>
 #include <memory>
 
diff --git a/llvm/tools/bugpoint/CrashDebugger.cpp b/llvm/tools/bugpoint/CrashDebugger.cpp
index 69837f9c2a8d..545d767c2ae6 100644
--- a/llvm/tools/bugpoint/CrashDebugger.cpp
+++ b/llvm/tools/bugpoint/CrashDebugger.cpp
@@ -26,7 +26,7 @@
 #include "llvm/Support/ToolRunner.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/Cloning.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include <fstream>
 #include <set>
 using namespace llvm;
diff --git a/llvm/tools/bugpoint/ExecutionDriver.cpp b/llvm/tools/bugpoint/ExecutionDriver.cpp
index 62f0a242a6f4..0687c4c08f3b 100644
--- a/llvm/tools/bugpoint/ExecutionDriver.cpp
+++ b/llvm/tools/bugpoint/ExecutionDriver.cpp
@@ -14,10 +14,10 @@
 
 #include "BugDriver.h"
 #include "llvm/Support/ToolRunner.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/FileUtilities.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/Support/SystemUtils.h"
 #include <fstream>
 using namespace llvm;
 
diff --git a/llvm/tools/bugpoint/ExtractFunction.cpp b/llvm/tools/bugpoint/ExtractFunction.cpp
index 7806857f2ef1..cf02ef73a959 100644
--- a/llvm/tools/bugpoint/ExtractFunction.cpp
+++ b/llvm/tools/bugpoint/ExtractFunction.cpp
@@ -24,9 +24,9 @@
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/FunctionUtils.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/CommandLine.h"
-#include "Support/Debug.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/Support/FileUtilities.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/tools/bugpoint/Miscompilation.cpp b/llvm/tools/bugpoint/Miscompilation.cpp
index 0b7711b611b0..bead5dc9924a 100644
--- a/llvm/tools/bugpoint/Miscompilation.cpp
+++ b/llvm/tools/bugpoint/Miscompilation.cpp
@@ -23,8 +23,8 @@
 #include "llvm/Support/Mangler.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Support/Linker.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 using namespace llvm;
 
 namespace llvm {
diff --git a/llvm/tools/bugpoint/OptimizerDriver.cpp b/llvm/tools/bugpoint/OptimizerDriver.cpp
index c5c437ccdb8f..23e40fda5c31 100644
--- a/llvm/tools/bugpoint/OptimizerDriver.cpp
+++ b/llvm/tools/bugpoint/OptimizerDriver.cpp
@@ -21,7 +21,7 @@
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include <fstream>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/llvm/tools/bugpoint/bugpoint.cpp b/llvm/tools/bugpoint/bugpoint.cpp
index 1ff84f24089e..a4eae3cecd06 100644
--- a/llvm/tools/bugpoint/bugpoint.cpp
+++ b/llvm/tools/bugpoint/bugpoint.cpp
@@ -16,11 +16,12 @@
 #include "BugDriver.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/Support/ToolRunner.h"
-#include "Support/CommandLine.h"
+#include "llvm/System/SysConfig.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
-#include "Support/PluginLoader.h"
-#include "Config/unistd.h"
-#include <sys/resource.h>
+#include "llvm/Config/unistd.h"
+//#include <sys/resource.h>
 using namespace llvm;
 
 static cl::list<std::string>
@@ -45,14 +46,8 @@ int main(int argc, char **argv) {
   D.addPasses(PassList.begin(), PassList.end());
 
   // Bugpoint has the ability of generating a plethora of core files, so to
-  // avoid filling up the disk, set the max core file size to 0.
-  struct rlimit rlim;
-  rlim.rlim_cur = rlim.rlim_max = 0;
-  int res = setrlimit(RLIMIT_CORE, &rlim);
-  if (res < 0) {
-    // setrlimit() may have failed, but we're not going to let that stop us
-    perror("setrlimit: RLIMIT_CORE");
-  }
+  // avoid filling up the disk, we prevent it
+  sys::PreventCoreFiles();
 
   try {
     return D.run();
diff --git a/llvm/tools/extract/extract.cpp b/llvm/tools/extract/extract.cpp
index 050793b2e699..95822d03899b 100644
--- a/llvm/tools/extract/extract.cpp
+++ b/llvm/tools/extract/extract.cpp
@@ -18,7 +18,7 @@
 #include "llvm/Bytecode/WriteBytecodePass.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Target/TargetData.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <memory>
 #include <fstream>
diff --git a/llvm/tools/gccas/gccas.cpp b/llvm/tools/gccas/gccas.cpp
index c5f6c2395aca..ab64bbf18fc7 100644
--- a/llvm/tools/gccas/gccas.cpp
+++ b/llvm/tools/gccas/gccas.cpp
@@ -22,7 +22,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <memory>
 #include <fstream>
diff --git a/llvm/tools/gccld/GenerateCode.cpp b/llvm/tools/gccld/GenerateCode.cpp
index 029d5b90fdca..633517d09d3c 100644
--- a/llvm/tools/gccld/GenerateCode.cpp
+++ b/llvm/tools/gccld/GenerateCode.cpp
@@ -24,8 +24,8 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Support/Linker.h"
-#include "Support/SystemUtils.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/SystemUtils.h"
+#include "llvm/Support/CommandLine.h"
 using namespace llvm;
 
 namespace {
diff --git a/llvm/tools/gccld/Linker.cpp b/llvm/tools/gccld/Linker.cpp
index fcaa7af3d5f0..fa9ec70306ce 100644
--- a/llvm/tools/gccld/Linker.cpp
+++ b/llvm/tools/gccld/Linker.cpp
@@ -21,11 +21,11 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Support/Linker.h"
-#include "Config/config.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Config/config.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/SystemUtils.h"
 #include <algorithm>
 #include <fstream>
 #include <memory>
diff --git a/llvm/tools/gccld/gccld.cpp b/llvm/tools/gccld/gccld.cpp
index ba4681534d85..9137124f19a5 100644
--- a/llvm/tools/gccld/gccld.cpp
+++ b/llvm/tools/gccld/gccld.cpp
@@ -29,10 +29,10 @@
 #include "llvm/Transforms/IPO.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Support/Linker.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/SystemUtils.h"
 #include <fstream>
 #include <memory>
 using namespace llvm;
diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp
index 0d35ea20aa16..4e1e0cce7bb0 100644
--- a/llvm/tools/llc/llc.cpp
+++ b/llvm/tools/llc/llc.cpp
@@ -20,8 +20,8 @@
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
 #include "llvm/Pass.h"
-#include "Support/CommandLine.h"
-#include "Support/PluginLoader.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>
diff --git a/llvm/tools/llee/ExecveHandler.c b/llvm/tools/llee/ExecveHandler.c
index 088f1dba535c..89d153653850 100644
--- a/llvm/tools/llee/ExecveHandler.c
+++ b/llvm/tools/llee/ExecveHandler.c
@@ -13,7 +13,7 @@
 \*===----------------------------------------------------------------------===*/
 
 #include "SysUtils.h"
-#include "Config/unistd.h"
+#include "llvm/Config/unistd.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/llvm/tools/llee/OSInterface.h b/llvm/tools/llee/OSInterface.h
index 26b48fd1af52..0e026e10b142 100644
--- a/llvm/tools/llee/OSInterface.h
+++ b/llvm/tools/llee/OSInterface.h
@@ -16,7 +16,7 @@
 #ifndef OS_INTERFACE_H
 #define OS_INTERFACE_H
 
-#include "Config/sys/types.h"
+#include "llvm/Config/sys/types.h"
 
 struct stat;
 
diff --git a/llvm/tools/llee/StorageProxy.c b/llvm/tools/llee/StorageProxy.c
index 656d3164cfcf..05ffdf4b4c71 100644
--- a/llvm/tools/llee/StorageProxy.c
+++ b/llvm/tools/llee/StorageProxy.c
@@ -7,10 +7,10 @@
 
 #include "OSInterface.h"
 #include "SysUtils.h"
-#include "Config/fcntl.h"
-#include "Config/unistd.h"
-#include "Config/sys/types.h"
-#include "Config/sys/stat.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/stat.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/llvm/tools/llee/SysUtils.c b/llvm/tools/llee/SysUtils.c
index d7bab1d989da..0325c40b9d71 100644
--- a/llvm/tools/llee/SysUtils.c
+++ b/llvm/tools/llee/SysUtils.c
@@ -13,12 +13,12 @@
 \*===----------------------------------------------------------------------===*/
 
 #include "SysUtils.h"
-#include "Config/dlfcn.h"
-#include "Config/fcntl.h"
-#include "Config/unistd.h"
-#include "Config/sys/stat.h"
-#include "Config/sys/types.h"
-#include "Config/sys/wait.h"
+#include "llvm/Config/dlfcn.h"
+#include "llvm/Config/fcntl.h"
+#include "llvm/Config/unistd.h"
+#include "llvm/Config/sys/stat.h"
+#include "llvm/Config/sys/types.h"
+#include "llvm/Config/sys/wait.h"
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/llvm/tools/lli/lli.cpp b/llvm/tools/lli/lli.cpp
index 066bfbc9e9d5..eb8ac0126e95 100644
--- a/llvm/tools/lli/lli.cpp
+++ b/llvm/tools/lli/lli.cpp
@@ -19,8 +19,8 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/ExecutionEngine/GenericValue.h"
-#include "Support/CommandLine.h"
-#include "Support/PluginLoader.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
 
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index 4b79cd367d8f..07fc1810e82f 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -13,8 +13,8 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
 #include <string>
 #include <fstream>
diff --git a/llvm/tools/llvm-as/llvm-as.cpp b/llvm/tools/llvm-as/llvm-as.cpp
index b49702c32eec..1d48f7a7fa12 100644
--- a/llvm/tools/llvm-as/llvm-as.cpp
+++ b/llvm/tools/llvm-as/llvm-as.cpp
@@ -19,7 +19,7 @@
 #include "llvm/Assembly/Parser.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Analysis/Verifier.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>
diff --git a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
index e3dff659d2f3..d4be138fe77a 100644
--- a/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
+++ b/llvm/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
@@ -31,7 +31,7 @@
 
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Bytecode/Analyzer.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>
diff --git a/llvm/tools/llvm-db/CLIDebugger.cpp b/llvm/tools/llvm-db/CLIDebugger.cpp
index c48a919f80aa..75798d235272 100644
--- a/llvm/tools/llvm-db/CLIDebugger.cpp
+++ b/llvm/tools/llvm-db/CLIDebugger.cpp
@@ -15,7 +15,7 @@
 #include "CLIDebugger.h"
 #include "CLICommand.h"
 #include "llvm/Debugger/SourceFile.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 using namespace llvm;
 
diff --git a/llvm/tools/llvm-db/Commands.cpp b/llvm/tools/llvm-db/Commands.cpp
index 56dbd53526c3..6df2f693a164 100644
--- a/llvm/tools/llvm-db/Commands.cpp
+++ b/llvm/tools/llvm-db/Commands.cpp
@@ -18,8 +18,8 @@
 #include "llvm/Debugger/SourceLanguage.h"
 #include "llvm/Debugger/SourceFile.h"
 #include "llvm/Debugger/InferiorProcess.h"
-#include "Support/FileUtilities.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 using namespace llvm;
 
diff --git a/llvm/tools/llvm-db/llvm-db.cpp b/llvm/tools/llvm-db/llvm-db.cpp
index 1b7385c0658d..23cbca2ef4f1 100644
--- a/llvm/tools/llvm-db/llvm-db.cpp
+++ b/llvm/tools/llvm-db/llvm-db.cpp
@@ -13,8 +13,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "CLIDebugger.h"
-#include "Support/CommandLine.h"
-#include "Support/PluginLoader.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/PluginLoader.h"
 #include "llvm/System/Signals.h"
 #include <iostream>
 
diff --git a/llvm/tools/llvm-dis/llvm-dis.cpp b/llvm/tools/llvm-dis/llvm-dis.cpp
index ac8101b6c425..37d5c84f7514 100644
--- a/llvm/tools/llvm-dis/llvm-dis.cpp
+++ b/llvm/tools/llvm-dis/llvm-dis.cpp
@@ -20,7 +20,7 @@
 #include "llvm/PassManager.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Assembly/PrintModulePass.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <memory>
diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp
index 3cd3c7b54dd8..664529850c53 100644
--- a/llvm/tools/llvm-link/llvm-link.cpp
+++ b/llvm/tools/llvm-link/llvm-link.cpp
@@ -17,8 +17,8 @@
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Bytecode/Writer.h"
 #include "llvm/Support/Linker.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
 #include <fstream>
 #include <iostream>
diff --git a/llvm/tools/llvm-nm/llvm-nm.cpp b/llvm/tools/llvm-nm/llvm-nm.cpp
index ba8b5d7f0d5f..1a2b40e9c9b0 100644
--- a/llvm/tools/llvm-nm/llvm-nm.cpp
+++ b/llvm/tools/llvm-nm/llvm-nm.cpp
@@ -18,8 +18,8 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include "llvm/System/Signals.h"
 #include <cctype>
 #include <cerrno>
diff --git a/llvm/tools/llvm-prof/llvm-prof.cpp b/llvm/tools/llvm-prof/llvm-prof.cpp
index efb44d69b5c7..88344078bdab 100644
--- a/llvm/tools/llvm-prof/llvm-prof.cpp
+++ b/llvm/tools/llvm-prof/llvm-prof.cpp
@@ -18,7 +18,7 @@
 #include "llvm/Assembly/AsmAnnotationWriter.h"
 #include "llvm/Analysis/ProfileInfoLoader.h"
 #include "llvm/Bytecode/Reader.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
 #include <cstdio>
 #include <iostream>
diff --git a/llvm/tools/llvm-stub/llvm-stub.c b/llvm/tools/llvm-stub/llvm-stub.c
index a64c5df9f47b..8d5175af1009 100644
--- a/llvm/tools/llvm-stub/llvm-stub.c
+++ b/llvm/tools/llvm-stub/llvm-stub.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "Config/unistd.h"  /* provides definition of execve */
+#include "llvm/Config/unistd.h"  /* provides definition of execve */
 
 int main(int argc, char** argv) {
   const char *Interp = getenv("LLVMINTERP");
diff --git a/llvm/tools/llvmc/CompilerDriver.cpp b/llvm/tools/llvmc/CompilerDriver.cpp
index 51164d24678f..c015d9e867a3 100644
--- a/llvm/tools/llvmc/CompilerDriver.cpp
+++ b/llvm/tools/llvmc/CompilerDriver.cpp
@@ -17,9 +17,9 @@
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/System/Signals.h"
-#include "Support/FileUtilities.h"
-#include "Support/SetVector.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/FileUtilities.h"
+#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 
 using namespace llvm;
diff --git a/llvm/tools/llvmc/Configuration.cpp b/llvm/tools/llvmc/Configuration.cpp
index c398e529d743..6b5d33975f2c 100644
--- a/llvm/tools/llvmc/Configuration.cpp
+++ b/llvm/tools/llvmc/Configuration.cpp
@@ -15,9 +15,9 @@
 #include "Configuration.h"
 #include "ConfigLexer.h"
 #include "CompilerDriver.h"
-#include "Config/config.h"
-#include "Support/CommandLine.h"
-#include "Support/StringExtras.h"
+#include "llvm/Config/config.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/ADT/StringExtras.h"
 #include <iostream>
 #include <fstream>
 
diff --git a/llvm/tools/llvmc/Configuration.h b/llvm/tools/llvmc/Configuration.h
index 2ed565a80ed9..e194dd072ef2 100644
--- a/llvm/tools/llvmc/Configuration.h
+++ b/llvm/tools/llvmc/Configuration.h
@@ -15,7 +15,7 @@
 #define LLVM_TOOLS_LLVMC_CONFIGDATA_H
 
 #include "CompilerDriver.h"
-#include <Support/hash_map>
+#include <llvm/ADT/hash_map>
 
 namespace llvm {
   /// This class provides the high level interface to the LLVM Compiler Driver.
diff --git a/llvm/tools/llvmc/llvmc.cpp b/llvm/tools/llvmc/llvmc.cpp
index 8dab3017908d..f457795a0c77 100644
--- a/llvm/tools/llvmc/llvmc.cpp
+++ b/llvm/tools/llvmc/llvmc.cpp
@@ -18,7 +18,7 @@
 #include "Configuration.h"
 #include "llvm/Pass.h"
 #include "llvm/System/Signals.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include <iostream>
 
 using namespace llvm;
diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp
index 4810ebd8703d..f5666bc08e6b 100644
--- a/llvm/tools/opt/opt.cpp
+++ b/llvm/tools/opt/opt.cpp
@@ -21,8 +21,8 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/PassNameParser.h"
 #include "llvm/System/Signals.h"
-#include "Support/PluginLoader.h"
-#include "Support/SystemUtils.h"
+#include "llvm/Support/PluginLoader.h"
+#include "llvm/Support/SystemUtils.h"
 #include <fstream>
 #include <memory>
 #include <algorithm>
diff --git a/llvm/utils/TableGen/CodeEmitterGen.cpp b/llvm/utils/TableGen/CodeEmitterGen.cpp
index 906f4d6c7244..dcf10672a3a4 100644
--- a/llvm/utils/TableGen/CodeEmitterGen.cpp
+++ b/llvm/utils/TableGen/CodeEmitterGen.cpp
@@ -16,7 +16,7 @@
 #include "CodeEmitterGen.h"
 #include "CodeGenTarget.h"
 #include "Record.h"
-#include "Support/Debug.h"
+#include "llvm/Support/Debug.h"
 using namespace llvm;
 
 void CodeEmitterGen::run(std::ostream &o) {
diff --git a/llvm/utils/TableGen/FileParser.y b/llvm/utils/TableGen/FileParser.y
index bf10abc8be7a..8781049956b7 100644
--- a/llvm/utils/TableGen/FileParser.y
+++ b/llvm/utils/TableGen/FileParser.y
@@ -13,7 +13,7 @@
 
 %{
 #include "Record.h"
-#include "Support/StringExtras.h"
+#include "llvm/ADT/StringExtras.h"
 #include <algorithm>
 #include <cstdio>
 #define YYERROR_VERBOSE 1
diff --git a/llvm/utils/TableGen/InstrSelectorEmitter.cpp b/llvm/utils/TableGen/InstrSelectorEmitter.cpp
index f6ca2a22e46f..9a2ce4a6e870 100644
--- a/llvm/utils/TableGen/InstrSelectorEmitter.cpp
+++ b/llvm/utils/TableGen/InstrSelectorEmitter.cpp
@@ -14,8 +14,8 @@
 
 #include "InstrSelectorEmitter.h"
 #include "Record.h"
-#include "Support/Debug.h"
-#include "Support/StringExtras.h"
+#include "llvm/Support/Debug.h"
+#include "llvm/ADT/StringExtras.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/utils/TableGen/RegisterInfoEmitter.cpp b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
index ef79c35017ec..487890d374dc 100644
--- a/llvm/utils/TableGen/RegisterInfoEmitter.cpp
+++ b/llvm/utils/TableGen/RegisterInfoEmitter.cpp
@@ -17,8 +17,8 @@
 #include "CodeGenTarget.h"
 #include "CodeGenRegisters.h"
 #include "Record.h"
-#include "Support/StringExtras.h"
-#include "Support/STLExtras.h"
+#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <set>
 using namespace llvm;
 
diff --git a/llvm/utils/TableGen/TableGen.cpp b/llvm/utils/TableGen/TableGen.cpp
index 14e2352ece16..15b313191e5c 100644
--- a/llvm/utils/TableGen/TableGen.cpp
+++ b/llvm/utils/TableGen/TableGen.cpp
@@ -16,9 +16,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "Record.h"
-#include "Support/CommandLine.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/System/Signals.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/FileUtilities.h"
 #include "CodeEmitterGen.h"
 #include "RegisterInfoEmitter.h"
 #include "InstrInfoEmitter.h"
diff --git a/llvm/utils/fpcmp/fpcmp.cpp b/llvm/utils/fpcmp/fpcmp.cpp
index e45c3c0a2769..ff93b9bc49e4 100644
--- a/llvm/utils/fpcmp/fpcmp.cpp
+++ b/llvm/utils/fpcmp/fpcmp.cpp
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/CommandLine.h"
-#include "Support/FileUtilities.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/FileUtilities.h"
 #include <iostream>
 #include <cmath>