Eliminate duplicate or unneccesary #include's

llvm-svn: 2397

include/llvm/Bytecode/Writer.h

@@ -17,9 +17,9 @@
 #ifndef LLVM_BYTECODE_WRITER_H
 #define LLVM_BYTECODE_WRITER_H
 
-#include <iostream.h>
+#include <iosfwd>
 
 class Module;
-void WriteBytecodeToFile(const Module *C, ostream &Out);
+void WriteBytecodeToFile(const Module *C, std::ostream &Out);
 
 #endif

include/llvm/CodeGen/RegClass.h

@@ -8,11 +8,9 @@
 #ifndef REG_CLASS_H
 #define REG_CLASS_H
 
-#include "llvm/CodeGen/IGNode.h"
 #include "llvm/CodeGen/InterferenceGraph.h"
 #include "llvm/Target/MachineRegInfo.h"
 #include <stack>
-#include <iostream>
 class MachineRegClassInfo;
 
 typedef std::vector<unsigned> ReservedColorListType;

lib/Analysis/IPA/FindUnsafePointerTypes.cpp

@@ -20,7 +20,6 @@
 #include "llvm/Assembly/CachedWriter.h"
 #include "llvm/Type.h"
 #include "llvm/Instruction.h"
-#include "llvm/Function.h"
 #include "llvm/Module.h"
 #include "llvm/Support/InstIterator.h"
 #include "Support/CommandLine.h"

lib/Analysis/IPA/FindUsedTypes.cpp

@@ -10,7 +10,6 @@
 #include "llvm/GlobalVariable.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Module.h"
-#include "llvm/Function.h"
 #include "llvm/Instruction.h"
 #include "llvm/Support/InstIterator.h"
 

lib/Analysis/LiveVar/BBLiveVar.cpp

@@ -7,7 +7,6 @@
 #include "BBLiveVar.h"
 #include "llvm/Analysis/LiveVar/FunctionLiveVarInfo.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Support/CFG.h"
 #include "Support/SetOperations.h"
 #include <iostream>

lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp

@@ -8,7 +8,6 @@
 #include "llvm/Analysis/LiveVar/FunctionLiveVarInfo.h"
 #include "BBLiveVar.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Support/CFG.h"
 #include "Support/PostOrderIterator.h"
 #include "Support/SetOperations.h"

lib/Analysis/PostDominators.cpp

@@ -7,7 +7,6 @@
 
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Transforms/UnifyFunctionExitNodes.h"
-#include "llvm/Function.h"
 #include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/STLExtras.h"

lib/AsmParser/Parser.cpp

@@ -7,7 +7,6 @@
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Module.h"
 #include "ParserInternals.h"
-#include <stdio.h>  // for sprintf
 using std::string;
 
 // The useful interface defined by this file... Parse an ascii file, and return

lib/AsmParser/ParserInternals.h

@@ -8,10 +8,7 @@
 #ifndef PARSER_INTERNALS_H
 #define PARSER_INTERNALS_H
 
-#include <stdio.h>
 #define __STDC_LIMIT_MACROS
-
-#include "llvm/InstrTypes.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Constants.h"
 #include "llvm/iOther.h"

lib/AsmParser/llvmAsmParser.y

@@ -6,13 +6,9 @@
 
 %{
 #include "ParserInternals.h"
-#include "llvm/Assembly/Parser.h"
 #include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
 #include "llvm/GlobalVariable.h"
-#include "llvm/Function.h"
-#include "llvm/BasicBlock.h"
-#include "llvm/DerivedTypes.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iMemory.h"
 #include "llvm/iPHINode.h"
@@ -22,7 +18,6 @@
 #include <list>
 #include <utility>            // Get definition of pair class
 #include <algorithm>
-#include <stdio.h>            // This embarasment is due to our flex lexer...
 #include <iostream>
 using std::list;
 using std::vector;

lib/Bytecode/Reader/ConstantReader.cpp

@@ -10,7 +10,6 @@
 
 #include "ReaderInternals.h"
 #include "llvm/Module.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Constants.h"
 #include "llvm/GlobalVariable.h"
 #include <algorithm>

lib/Bytecode/Reader/Reader.cpp

@@ -15,7 +15,6 @@
 #include "llvm/Bytecode/Format.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/Module.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Constants.h"
 #include "llvm/iPHINode.h"
 #include "llvm/iOther.h"

lib/Bytecode/Writer/InstructionWriter.cpp

@@ -13,7 +13,6 @@
 #include "llvm/Module.h"
 #include "llvm/Function.h"
 #include "llvm/BasicBlock.h"
-#include "llvm/Instruction.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/iOther.h"
 #include "llvm/iTerminators.h"

lib/Bytecode/Writer/WriterInternals.h

@@ -17,7 +17,6 @@
 #include "llvm/Bytecode/Primitives.h"
 #include "llvm/SlotCalculator.h"
 #include "llvm/Instruction.h"
-#include <deque>
 
 class BytecodeWriter {
   std::deque<unsigned char> &Out;

lib/CodeGen/InstrSched/InstrScheduling.cpp

@@ -5,7 +5,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/InstrScheduling.h"
+#include "SchedPriorities.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"
@@ -13,11 +13,7 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Instruction.h"
-#include "SchedPriorities.h"
-#include <ext/hash_set>
 #include <algorithm>
-#include <iterator>
-#include <iostream>
 using std::cerr;
 using std::vector;
 

lib/CodeGen/InstrSched/SchedGraph.cpp

@@ -14,9 +14,7 @@
 
 #include "SchedGraph.h"
 #include "llvm/CodeGen/InstrSelection.h"
-#include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
-#include "llvm/Target/MachineInstrInfo.h"
 #include "llvm/Target/MachineRegInfo.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/BasicBlock.h"

lib/CodeGen/InstrSched/SchedGraph.h

@@ -20,7 +20,6 @@
 #define LLVM_CODEGEN_SCHEDGRAPH_H
 
 #include "llvm/CodeGen/MachineInstr.h"
-#include "Support/NonCopyable.h"
 #include "Support/HashExtras.h"
 #include "Support/GraphTraits.h"
 

lib/CodeGen/InstrSched/SchedPriorities.cpp

@@ -22,7 +22,6 @@
 #include "llvm/Analysis/LiveVar/FunctionLiveVarInfo.h"
 #include "llvm/Support/CFG.h"
 #include "Support/PostOrderIterator.h"
-#include <iostream>
 using std::cerr;
 
 SchedPriorities::SchedPriorities(const Function *, const SchedGraph *G,

lib/CodeGen/InstrSelection/InstrSelection.cpp

@@ -16,7 +16,6 @@
 
 #include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/CodeGen/InstrSelectionSupport.h"
-#include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/InstrForest.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"

lib/CodeGen/InstrSelection/InstrSelectionSupport.cpp

@@ -13,7 +13,6 @@
 
 #include "llvm/CodeGen/InstrSelectionSupport.h"
 #include "llvm/CodeGen/InstrSelection.h"
-#include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"
 #include "llvm/CodeGen/InstrForest.h"

lib/CodeGen/MachineCodeForInstruction.cpp

@@ -19,7 +19,6 @@
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/InstrSelection.h"
-#include "llvm/Instruction.h"
 
 static AnnotationID MCFI_AID(
              AnnotationManager::getID("CodeGen::MachineCodeForInstruction"));

lib/CodeGen/RegAlloc/IGNode.h

@@ -25,7 +25,6 @@
 #ifndef IG_NODE_H
 #define IG_NODE_H
 
-#include "llvm/CodeGen/RegAllocCommon.h"
 #include "llvm/CodeGen/LiveRange.h"
 class LiveRange;
 class RegClass;

lib/CodeGen/RegAlloc/InterferenceGraph.cpp

@@ -1,6 +1,6 @@
 #include "llvm/CodeGen/InterferenceGraph.h"
 #include "Support/STLExtras.h"
-#include <iostream>
+#include "llvm/CodeGen/RegAllocCommon.h"
 #include <algorithm>
 using std::cerr;
 

lib/CodeGen/RegAlloc/LiveRangeInfo.cpp

@@ -5,7 +5,7 @@
 #include "llvm/Function.h"
 #include "llvm/BasicBlock.h"
 #include "Support/SetOperations.h"
-#include <iostream>
+#include "llvm/CodeGen/RegAllocCommon.h"
 using std::cerr;
 
 LiveRangeInfo::LiveRangeInfo(const Function *F, const TargetMachine &tm,

lib/CodeGen/RegAlloc/PhyRegAlloc.cpp

@@ -21,6 +21,7 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/Function.h"
 #include "llvm/Type.h"
+#include "llvm/CodeGen/RegAllocCommon.h"
 #include <iostream>
 #include <math.h>
 using std::cerr;

lib/CodeGen/RegAlloc/RegClass.cpp

@@ -1,5 +1,5 @@
 #include "llvm/CodeGen/RegClass.h"
-#include <iostream>
+#include "llvm/CodeGen/RegAllocCommon.h"
 using std::cerr;
 
 //----------------------------------------------------------------------------

lib/CodeGen/RegAlloc/RegClass.h

@@ -8,11 +8,9 @@
 #ifndef REG_CLASS_H
 #define REG_CLASS_H
 
-#include "llvm/CodeGen/IGNode.h"
 #include "llvm/CodeGen/InterferenceGraph.h"
 #include "llvm/Target/MachineRegInfo.h"
 #include <stack>
-#include <iostream>
 class MachineRegClassInfo;
 
 typedef std::vector<unsigned> ReservedColorListType;

lib/Support/CommandLine.cpp

@@ -11,7 +11,6 @@
 
 #include "Support/CommandLine.h"
 #include "Support/STLExtras.h"
-#include <vector>
 #include <algorithm>
 #include <map>
 #include <set>

lib/Target/Sparc/EmitAssembly.cpp

@@ -17,7 +17,6 @@
 #include "llvm/GlobalVariable.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/Annotation.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Function.h"
 #include "llvm/Module.h"
@@ -25,7 +24,6 @@
 #include "llvm/Pass.h"
 #include "llvm/Assembly/Writer.h"
 #include "Support/StringExtras.h"
-#include "Support/HashExtras.h"
 #include <iostream>
 using std::string;
 

lib/Target/Sparc/SparcInstrInfo.cpp

@@ -15,7 +15,6 @@
 #include "llvm/Target/Sparc.h"
 #include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/CodeGen/InstrSelectionSupport.h"
-#include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineCodeForMethod.h"
 #include "llvm/Function.h"
 #include "llvm/Constants.h"

lib/Target/Sparc/SparcInternals.h

@@ -13,7 +13,6 @@
 #define SPARC_INTERNALS_H
 
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Target/MachineInstrInfo.h"
 #include "llvm/Target/MachineSchedInfo.h"
 #include "llvm/Target/MachineFrameInfo.h"
 #include "llvm/Target/MachineCacheInfo.h"

lib/Target/Sparc/SparcRegClassInfo.cpp

@@ -1,5 +1,5 @@
 #include "SparcRegClassInfo.h"
-#include "llvm/CodeGen/IGNode.h"
+#include "llvm/CodeGen/RegAllocCommon.h"
 #include "llvm/Target/Sparc.h"
 #include "llvm/Type.h"
 #include <iostream>

lib/Target/Sparc/SparcRegInfo.cpp

@@ -11,6 +11,7 @@
 #include "llvm/CodeGen/MachineCodeForMethod.h"
 #include "llvm/CodeGen/PhyRegAlloc.h"
 #include "llvm/CodeGen/MachineInstr.h"
+#include "llvm/CodeGen/RegAllocCommon.h"
 #include "llvm/Analysis/LiveVar/FunctionLiveVarInfo.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"

lib/Transforms/ExprTypeConvert.cpp

@@ -7,16 +7,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "TransformInternals.h"
-#include "llvm/Function.h"
 #include "llvm/iOther.h"
 #include "llvm/iPHINode.h"
 #include "llvm/iMemory.h"
-#include "llvm/Constants.h"
 #include "llvm/ConstantHandling.h"
 #include "llvm/Transforms/Scalar/DCE.h"
 #include "llvm/Analysis/Expressions.h"
 #include "Support/STLExtras.h"
-#include <map>
 #include <algorithm>
 #include <iostream>
 using std::cerr;

lib/Transforms/HoistPHIConstants.cpp

@@ -12,8 +12,6 @@
 #include "llvm/BasicBlock.h"
 #include "llvm/Function.h"
 #include "llvm/Pass.h"
-#include <map>
-#include <vector>
 
 typedef std::pair<BasicBlock *, Value*> BBConstTy;
 typedef std::map<BBConstTy, CastInst *> CachedCopyMap;

lib/Transforms/IPO/DeadTypeElimination.cpp

@@ -25,7 +25,6 @@
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"
 #include "llvm/Support/CFG.h"
-#include "llvm/Pass.h"
 #include <algorithm>
 #include <iostream>
 using std::vector;

lib/Transforms/IPO/GlobalDCE.cpp

@@ -9,9 +9,7 @@
 #include "llvm/Analysis/CallGraph.h"
 #include "llvm/Module.h"
 #include "llvm/Function.h"
-#include "llvm/Pass.h"
 #include "Support/DepthFirstIterator.h"
-#include <set>
 
 static bool RemoveUnreachableFunctions(Module *M, CallGraph &CallGraph) {
   // Calculate which functions are reachable from the external functions in the

lib/Transforms/IPO/InlineSimple.cpp

@@ -28,7 +28,6 @@
 #include "llvm/Type.h"
 #include "llvm/Argument.h"
 #include <algorithm>
-#include <map>
 #include <iostream>
 using std::cerr;
 

lib/Transforms/IPO/OldPoolAllocate.cpp

@@ -11,7 +11,6 @@
 
 #include "llvm/Transforms/IPO/PoolAllocate.h"
 #include "llvm/Transforms/CloneFunction.h"
-#include "llvm/Analysis/DataStructure.h"
 #include "llvm/Analysis/DataStructureGraph.h"
 #include "llvm/Module.h"
 #include "llvm/Function.h"

lib/Transforms/Instrumentation/ProfilePaths/ProfilePaths.cpp

@@ -27,12 +27,9 @@
 #include "llvm/Transforms/Instrumentation/ProfilePaths.h"
 #include "llvm/Transforms/UnifyFunctionExitNodes.h"
 #include "llvm/Support/CFG.h"
-#include "llvm/Function.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/iMemory.h"
-#include "llvm/Pass.h"
 #include "Graph.h"
 
 using std::vector;

lib/Transforms/LevelRaise.cpp

@@ -8,10 +8,8 @@
 
 #include "llvm/Transforms/LevelChange.h"
 #include "TransformInternals.h"
-#include "llvm/Function.h"
 #include "llvm/iOther.h"
 #include "llvm/iMemory.h"
-#include "llvm/Constants.h"
 #include "llvm/Pass.h"
 #include "llvm/ConstantHandling.h"
 #include "llvm/Transforms/Scalar/DCE.h"

lib/Transforms/Scalar/ADCE.cpp

@@ -7,7 +7,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Scalar/DCE.h"
-#include "llvm/Instruction.h"
 #include "llvm/Type.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/Writer.h"

lib/Transforms/Scalar/DCE.cpp

@@ -26,8 +26,6 @@
 #include "llvm/Transforms/Scalar/DCE.h"
 #include "llvm/Module.h"
 #include "llvm/GlobalVariable.h"
-#include "llvm/Function.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iPHINode.h"
 #include "llvm/Constant.h"

lib/Transforms/Scalar/GCSE.cpp

@@ -15,13 +15,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/Scalar/GCSE.h"
-#include "llvm/Pass.h"
 #include "llvm/InstrTypes.h"
 #include "llvm/iMemory.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/InstVisitor.h"
 #include "llvm/Support/InstIterator.h"
-#include <set>
 #include <algorithm>
 
 namespace {

lib/Transforms/Scalar/IndVarSimplify.cpp

@@ -11,9 +11,7 @@
 #include "llvm/iPHINode.h"
 #include "llvm/iOther.h"
 #include "llvm/Type.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/Constants.h"
-#include "llvm/Pass.h"
 #include "llvm/Support/CFG.h"
 #include "Support/STLExtras.h"
 

lib/Transforms/Scalar/InductionVars.cpp

@@ -21,13 +21,10 @@
 
 #include "llvm/Transforms/Scalar/InductionVars.h"
 #include "llvm/Constants.h"
-#include "llvm/Analysis/IntervalPartition.h"
 #include "llvm/iPHINode.h"
-#include "llvm/Function.h"
-#include "llvm/BasicBlock.h"
-#include "llvm/InstrTypes.h"
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
+#include "llvm/Analysis/IntervalPartition.h"
 #include "Support/STLExtras.h"
 #include <algorithm>
 #include <iostream>

lib/Transforms/Scalar/InstructionCombining.cpp

@@ -16,7 +16,6 @@
 
 #include "llvm/Transforms/Scalar/InstructionCombining.h"
 #include "llvm/ConstantHandling.h"
-#include "llvm/Function.h"
 #include "llvm/iMemory.h"
 #include "llvm/iOther.h"
 #include "llvm/iOperators.h"

lib/Transforms/Scalar/LowerAllocations.cpp

@@ -8,13 +8,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Transforms/ChangeAllocations.h"
-#include "llvm/Target/TargetData.h"
 #include "llvm/Module.h"
 #include "llvm/Function.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/iMemory.h"
 #include "llvm/iOther.h"
-#include "llvm/Constants.h"
 #include "llvm/Pass.h"
 #include "TransformInternals.h"
 using std::vector;

lib/Transforms/Scalar/SCCP.cpp

@@ -18,8 +18,6 @@
 #include "llvm/Transforms/Scalar/ConstantProp.h"
 #include "llvm/ConstantHandling.h"
 #include "llvm/Function.h"
-#include "llvm/BasicBlock.h"
-#include "llvm/Constants.h"
 #include "llvm/iPHINode.h"
 #include "llvm/iMemory.h"
 #include "llvm/iTerminators.h"
@@ -28,7 +26,6 @@
 #include "llvm/Support/InstVisitor.h"
 #include "Support/STLExtras.h"
 #include <algorithm>
-#include <map>
 #include <set>
 #include <iostream>
 using std::cerr;

lib/Transforms/Utils/PromoteMemoryToRegister.cpp

@@ -22,7 +22,6 @@
 #include "llvm/iMemory.h"
 #include "llvm/iPHINode.h"
 #include "llvm/iTerminators.h"
-#include "llvm/Pass.h"
 #include "llvm/Function.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Constant.h"

lib/VMCore/AsmWriter.cpp

@@ -25,7 +25,6 @@
 #include "Support/StringExtras.h"
 #include "Support/STLExtras.h"
 #include <algorithm>
-#include <map>
 using std::string;
 using std::map;
 using std::vector;

lib/VMCore/BasicBlock.cpp

@@ -6,7 +6,6 @@
 
 #include "ValueHolderImpl.h"
 #include "llvm/iTerminators.h"
-#include "llvm/SymbolTable.h"
 #include "llvm/Type.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/iPHINode.h"

lib/VMCore/Dominators.cpp

@@ -7,7 +7,6 @@
 
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Transforms/UnifyFunctionExitNodes.h"
-#include "llvm/Function.h"
 #include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/STLExtras.h"

lib/VMCore/Function.cpp

@@ -7,7 +7,6 @@
 
 #include "llvm/Function.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/SymbolTable.h"
 #include "llvm/Module.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/BasicBlock.h"

lib/VMCore/Module.cpp

@@ -8,7 +8,6 @@
 #include "llvm/Function.h"
 #include "llvm/GlobalVariable.h"
 #include "llvm/InstrTypes.h"
-#include "llvm/Type.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "Support/STLExtras.h"

lib/VMCore/Verifier.cpp

@@ -36,9 +36,7 @@
 
 #include "llvm/Analysis/Verifier.h"
 #include "llvm/Pass.h"
-#include "llvm/Function.h"
 #include "llvm/Module.h"
-#include "llvm/BasicBlock.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/iPHINode.h"
 #include "llvm/iTerminators.h"

support/lib/Support/CommandLine.cpp

@@ -11,7 +11,6 @@
 
 #include "Support/CommandLine.h"
 #include "Support/STLExtras.h"
-#include <vector>
 #include <algorithm>
 #include <map>
 #include <set>

tools/analyze/analyze.cpp

@@ -10,9 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/Instruction.h"
 #include "llvm/Module.h"
-#include "llvm/Function.h"
 #include "llvm/iPHINode.h"
 #include "llvm/Type.h"
 #include "llvm/PassManager.h"
@@ -34,7 +32,6 @@
 #include "llvm/Support/InstIterator.h"
 #include "Support/CommandLine.h"
 #include <algorithm>
-#include <iostream>
 
 using std::ostream;
 using std::string;

tools/as/as.cpp

@@ -15,7 +15,6 @@
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
 #include <fstream>
-#include <string>
 #include <memory>
 
 cl::String InputFilename ("", "Parse <arg> file, compile to bytecode", 0, "-");

tools/dis/dis.cpp

@@ -18,7 +18,6 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
-#include "llvm/Function.h"
 #include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/PostOrderIterator.h"

tools/gccas/gccas.cpp

@@ -24,7 +24,6 @@
 #include "Support/Signals.h"
 #include <memory>
 #include <fstream>
-#include <string>
 
 cl::String InputFilename ("", "Parse <arg> file, compile to bytecode",
                           cl::Required, "");

tools/llc/llc.cpp

@@ -20,7 +20,6 @@
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
 #include <memory>
-#include <string>
 #include <fstream>
 using std::string;
 

tools/llvm-as/as.cpp

@@ -15,7 +15,6 @@
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
 #include <fstream>
-#include <string>
 #include <memory>
 
 cl::String InputFilename ("", "Parse <arg> file, compile to bytecode", 0, "-");

tools/llvm-as/llvm-as.cpp

@@ -15,7 +15,6 @@
 #include "Support/CommandLine.h"
 #include "Support/Signals.h"
 #include <fstream>
-#include <string>
 #include <memory>
 
 cl::String InputFilename ("", "Parse <arg> file, compile to bytecode", 0, "-");

tools/llvm-dis/dis.cpp

@@ -18,7 +18,6 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
-#include "llvm/Function.h"
 #include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/PostOrderIterator.h"

tools/llvm-dis/llvm-dis.cpp

@@ -18,7 +18,6 @@
 
 #include "llvm/Module.h"
 #include "llvm/Bytecode/Reader.h"
-#include "llvm/Function.h"
 #include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/PostOrderIterator.h"