Included assert.h so that the code compiles under newer versions of GCC.

llvm-svn: 6682

50 files changed, 82 insertions, 1 deletions

diff --git a/llvm/include/Support/Annotation.h b/llvm/include/Support/Annotation.h
index d9c02db8320..8dbad760d7a 100644
--- a/llvm/include/Support/Annotation.h
+++ b/llvm/include/Support/Annotation.h
@@ -16,6 +16,7 @@
 #define SUPPORT_ANNOTATION_H
 
 #include <string>
+#include <assert.h>
 class AnnotationID;
 class Annotation;
 class Annotable;
diff --git a/llvm/include/Support/BitSetVector.h b/llvm/include/Support/BitSetVector.h
index e52ca17c6b1..6ce56be4d0c 100644
--- a/llvm/include/Support/BitSetVector.h
+++ b/llvm/include/Support/BitSetVector.h
@@ -31,6 +31,7 @@
 #include <functional>
 #include <iostream>
 
+#include <assert.h>
 
 #define WORDSIZE (32U)
 
diff --git a/llvm/include/Support/CommandLine.h b/llvm/include/Support/CommandLine.h
index aafef95f56f..b524c977f7c 100644
--- a/llvm/include/Support/CommandLine.h
+++ b/llvm/include/Support/CommandLine.h
@@ -19,6 +19,8 @@
 #include <cstdarg>
 #include "boost/type_traits/object_traits.hpp"
 
+#include <assert.h>
+
 /// cl Namespace - This namespace contains all of the command line option
 /// processing machinery.  It is intentionally a short name to make qualified
 /// usage concise.
diff --git a/llvm/include/Support/SCCIterator.h b/llvm/include/Support/SCCIterator.h
index 26afdd76e4f..ed660d64c72 100644
--- a/llvm/include/Support/SCCIterator.h
+++ b/llvm/include/Support/SCCIterator.h
@@ -21,6 +21,7 @@
 #include <stack>
 #include <map>
 
+#include <assert.h>
 
 //--------------------------------------------------------------------------
 // class SCC : A simple representation of an SCC in a generic Graph.
diff --git a/llvm/include/Support/Timer.h b/llvm/include/Support/Timer.h
index e89f32feab4..40ab643928a 100644
--- a/llvm/include/Support/Timer.h
+++ b/llvm/include/Support/Timer.h
@@ -29,6 +29,8 @@
 #include <vector>
 #include <iosfwd>
 
+#include <assert.h>
+
 class TimerGroup;
 
 class Timer {
diff --git a/llvm/include/Support/Tree.h b/llvm/include/Support/Tree.h
index 9e8d5ae7efa..544e57e5263 100644
--- a/llvm/include/Support/Tree.h
+++ b/llvm/include/Support/Tree.h
@@ -10,6 +10,8 @@
 
 #include <vector>
 
+#include <assert.h>
+
 template<class ConcreteTreeNode, class Payload>
 class Tree {
   std::vector<ConcreteTreeNode*> Children;        // This nodes children, if any
diff --git a/llvm/include/llvm/Analysis/AliasSetTracker.h b/llvm/include/llvm/Analysis/AliasSetTracker.h
index 45867ae9162..d2f22f36bbb 100644
--- a/llvm/include/llvm/Analysis/AliasSetTracker.h
+++ b/llvm/include/llvm/Analysis/AliasSetTracker.h
@@ -10,6 +10,8 @@
 #ifndef LLVM_ANALYSIS_ALIASSETTRACKER_H
 #define LLVM_ANALYSIS_ALIASSETTRACKER_H
 
+#include <assert.h>
+
 #include "llvm/Support/CallSite.h"
 #include "Support/iterator"
 #include "Support/hash_map"
diff --git a/llvm/include/llvm/Analysis/CallGraph.h b/llvm/include/llvm/Analysis/CallGraph.h
index fde7c82abbe..69dc5cf4421 100644
--- a/llvm/include/llvm/Analysis/CallGraph.h
+++ b/llvm/include/llvm/Analysis/CallGraph.h
@@ -41,6 +41,8 @@
 #ifndef LLVM_ANALYSIS_CALLGRAPH_H
 #define LLVM_ANALYSIS_CALLGRAPH_H
 
+#include <assert.h>
+
 #include "Support/GraphTraits.h"
 #include "Support/STLExtras.h"
 #include "llvm/Pass.h"
diff --git a/llvm/include/llvm/Analysis/ConstantsScanner.h b/llvm/include/llvm/Analysis/ConstantsScanner.h
index 8035409bbf9..c3d112f27b9 100644
--- a/llvm/include/llvm/Analysis/ConstantsScanner.h
+++ b/llvm/include/llvm/Analysis/ConstantsScanner.h
@@ -9,6 +9,8 @@
 #ifndef LLVM_ANALYSIS_CONSTANTSSCANNER_H
 #define LLVM_ANALYSIS_CONSTANTSSCANNER_H
 
+#include <assert.h>
+
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Instruction.h"
 #include "Support/iterator"
diff --git a/llvm/include/llvm/Analysis/DSGraph.h b/llvm/include/llvm/Analysis/DSGraph.h
index eebefa5f5dd..1d6c073e573 100644
--- a/llvm/include/llvm/Analysis/DSGraph.h
+++ b/llvm/include/llvm/Analysis/DSGraph.h
@@ -7,6 +7,8 @@
 #ifndef LLVM_ANALYSIS_DSGRAPH_H
 #define LLVM_ANALYSIS_DSGRAPH_H
 
+#include <assert.h>
+
 #include "llvm/Analysis/DSNode.h"
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/include/llvm/Analysis/DSGraphTraits.h b/llvm/include/llvm/Analysis/DSGraphTraits.h
index 34e0e825d28..7a219192735 100644
--- a/llvm/include/llvm/Analysis/DSGraphTraits.h
+++ b/llvm/include/llvm/Analysis/DSGraphTraits.h
@@ -9,6 +9,8 @@
 #ifndef LLVM_ANALYSIS_DSGRAPHTRAITS_H
 #define LLVM_ANALYSIS_DSGRAPHTRAITS_H
 
+#include <assert.h>
+
 #include "llvm/Analysis/DSGraph.h"
 #include "Support/GraphTraits.h"
 #include "Support/iterator"
diff --git a/llvm/include/llvm/Analysis/DSNode.h b/llvm/include/llvm/Analysis/DSNode.h
index 5d4fc742675..b147077deee 100644
--- a/llvm/include/llvm/Analysis/DSNode.h
+++ b/llvm/include/llvm/Analysis/DSNode.h
@@ -7,6 +7,8 @@
 #ifndef LLVM_ANALYSIS_DSNODE_H
 #define LLVM_ANALYSIS_DSNODE_H
 
+#include <assert.h>
+
 #include "llvm/Analysis/DSSupport.h"
 template<typename BaseType>
 class DSNodeIterator;          // Data structure graph traversal iterator
diff --git a/llvm/include/llvm/Analysis/DSSupport.h b/llvm/include/llvm/Analysis/DSSupport.h
index d36be9bb3af..cc989f77361 100644
--- a/llvm/include/llvm/Analysis/DSSupport.h
+++ b/llvm/include/llvm/Analysis/DSSupport.h
@@ -7,6 +7,8 @@
 #ifndef LLVM_ANALYSIS_DSSUPPORT_H
 #define LLVM_ANALYSIS_DSSUPPORT_H
 
+#include <assert.h>
+
 #include <vector>
 #include <functional>
 #include <string>
diff --git a/llvm/include/llvm/Analysis/DataStructure.h b/llvm/include/llvm/Analysis/DataStructure.h
index ebcc3c5c645..fad56d966c3 100644
--- a/llvm/include/llvm/Analysis/DataStructure.h
+++ b/llvm/include/llvm/Analysis/DataStructure.h
@@ -7,6 +7,8 @@
 #ifndef LLVM_ANALYSIS_DATA_STRUCTURE_H
 #define LLVM_ANALYSIS_DATA_STRUCTURE_H
 
+#include <assert.h>
+
 #include "llvm/Pass.h"
 #include "Support/HashExtras.h"
 #include "Support/hash_set"
diff --git a/llvm/include/llvm/Analysis/DependenceGraph.h b/llvm/include/llvm/Analysis/DependenceGraph.h
index 509b6f429db..10013f7f4c1 100644
--- a/llvm/include/llvm/Analysis/DependenceGraph.h
+++ b/llvm/include/llvm/Analysis/DependenceGraph.h
@@ -23,6 +23,8 @@
 #include <vector>
 #include <utility>
 
+#include <assert.h>
+
 class Instruction;
 class Function;
 class Dependence;
diff --git a/llvm/include/llvm/Analysis/Dominators.h b/llvm/include/llvm/Analysis/Dominators.h
index 7881d82125b..3a4c4080a35 100644
--- a/llvm/include/llvm/Analysis/Dominators.h
+++ b/llvm/include/llvm/Analysis/Dominators.h
@@ -20,6 +20,7 @@
 
 #include "llvm/Pass.h"
 #include <set>
+#include <assert.h>
 class Instruction;
 
 template <typename GraphType> struct GraphTraits;
diff --git a/llvm/include/llvm/Analysis/IPModRef.h b/llvm/include/llvm/Analysis/IPModRef.h
index eed264f9785..a32203308c7 100644
--- a/llvm/include/llvm/Analysis/IPModRef.h
+++ b/llvm/include/llvm/Analysis/IPModRef.h
@@ -39,6 +39,8 @@
 #ifndef LLVM_ANALYSIS_IPMODREF_H
 #define LLVM_ANALYSIS_IPMODREF_H
 
+#include <assert.h>
+
 #include "llvm/Pass.h"
 #include "Support/BitSetVector.h"
 #include "Support/hash_map"
diff --git a/llvm/include/llvm/Analysis/InstForest.h b/llvm/include/llvm/Analysis/InstForest.h
index 243b0fdd054..81b3506414e 100644
--- a/llvm/include/llvm/Analysis/InstForest.h
+++ b/llvm/include/llvm/Analysis/InstForest.h
@@ -19,6 +19,7 @@
 #include "llvm/Function.h"
 #include "Support/Tree.h"
 #include <map>
+#include <assert.h>
 
 template<class Payload> class InstTreeNode;
 template<class Payload> class InstForest;
diff --git a/llvm/include/llvm/Analysis/IntervalIterator.h b/llvm/include/llvm/Analysis/IntervalIterator.h
index 5417aa74dc7..6b500806918 100644
--- a/llvm/include/llvm/Analysis/IntervalIterator.h
+++ b/llvm/include/llvm/Analysis/IntervalIterator.h
@@ -33,6 +33,7 @@
 #include <stack>
 #include <set>
 #include <algorithm>
+#include <assert.h>
 
 // getNodeHeader - Given a source graph node and the source graph, return the 
 // BasicBlock that is the header node.  This is the opposite of
diff --git a/llvm/include/llvm/Analysis/MemoryDepAnalysis.h b/llvm/include/llvm/Analysis/MemoryDepAnalysis.h
index 965a2f42a18..71adc123a56 100644
--- a/llvm/include/llvm/Analysis/MemoryDepAnalysis.h
+++ b/llvm/include/llvm/Analysis/MemoryDepAnalysis.h
@@ -20,6 +20,7 @@
 #include "Support/NonCopyable.h"
 #include "Support/hash_map"
 
+#include <assert.h>
 
 class Instruction;
 class Function;
diff --git a/llvm/include/llvm/Analysis/PgmDependenceGraph.h b/llvm/include/llvm/Analysis/PgmDependenceGraph.h
index 778ee78d90f..d5b2a148f28 100644
--- a/llvm/include/llvm/Analysis/PgmDependenceGraph.h
+++ b/llvm/include/llvm/Analysis/PgmDependenceGraph.h
@@ -40,6 +40,7 @@
 #include "Support/NonCopyable.h"
 #include <iterator>
 
+#include <assert.h>
 
 class Instruction;
 class Function;
diff --git a/llvm/include/llvm/CodeGen/InstrForest.h b/llvm/include/llvm/CodeGen/InstrForest.h
index d9381128d64..d6eaf7673ad 100644
--- a/llvm/include/llvm/CodeGen/InstrForest.h
+++ b/llvm/include/llvm/CodeGen/InstrForest.h
@@ -21,6 +21,7 @@
 
 #include "llvm/Instruction.h"
 #include "Support/HashExtras.h"
+#include <assert.h>
 
 class Constant;
 class BasicBlock;
diff --git a/llvm/include/llvm/CodeGen/InstrSelection.h b/llvm/include/llvm/CodeGen/InstrSelection.h
index c1ed86ed436..a305578bfbb 100644
--- a/llvm/include/llvm/CodeGen/InstrSelection.h
+++ b/llvm/include/llvm/CodeGen/InstrSelection.h
@@ -8,6 +8,7 @@
 #define LLVM_CODEGEN_INSTR_SELECTION_H
 
 #include "llvm/Instruction.h"
+#include <assert.h>
 class Function;
 class InstrForest;
 class MachineInstr;
diff --git a/llvm/include/llvm/CodeGen/LiveVariables.h b/llvm/include/llvm/CodeGen/LiveVariables.h
index 51d3e82e771..881fce4b0dc 100644
--- a/llvm/include/llvm/CodeGen/LiveVariables.h
+++ b/llvm/include/llvm/CodeGen/LiveVariables.h
@@ -24,6 +24,7 @@
 
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include <map>
+#include <assert.h>
 
 class MRegisterInfo;
 
diff --git a/llvm/include/llvm/CodeGen/MachineCodeForInstruction.h b/llvm/include/llvm/CodeGen/MachineCodeForInstruction.h
index ff171e9621d..91b4dfdc5e2 100644
--- a/llvm/include/llvm/CodeGen/MachineCodeForInstruction.h
+++ b/llvm/include/llvm/CodeGen/MachineCodeForInstruction.h
@@ -20,6 +20,8 @@
 
 #include "Support/Annotation.h"
 #include <vector>
+#include <assert.h>
+
 class MachineInstr;
 class Instruction;
 class Value;
diff --git a/llvm/include/llvm/CodeGen/MachineFrameInfo.h b/llvm/include/llvm/CodeGen/MachineFrameInfo.h
index 6f907e1ff36..5b2b0b52346 100644
--- a/llvm/include/llvm/CodeGen/MachineFrameInfo.h
+++ b/llvm/include/llvm/CodeGen/MachineFrameInfo.h
@@ -35,6 +35,7 @@ class TargetData;
 class TargetRegisterClass;
 class MachineFunction;
 #include <vector>
+#include <assert.h>
 
 class MachineFrameInfo {
 
diff --git a/llvm/include/llvm/CodeGen/MachineInstr.h b/llvm/include/llvm/CodeGen/MachineInstr.h
index 2ab9a0708f1..3c2f9abc257 100644
--- a/llvm/include/llvm/CodeGen/MachineInstr.h
+++ b/llvm/include/llvm/CodeGen/MachineInstr.h
@@ -13,6 +13,8 @@
 #include "Support/Annotation.h"
 #include "Support/iterator"
 #include <set>
+#include <assert.h>
+
 class Value;
 class Function;
 class MachineBasicBlock;
diff --git a/llvm/include/llvm/CodeGen/MachineInstrAnnot.h b/llvm/include/llvm/CodeGen/MachineInstrAnnot.h
index e1902e77b38..b7e22d81383 100644
--- a/llvm/include/llvm/CodeGen/MachineInstrAnnot.h
+++ b/llvm/include/llvm/CodeGen/MachineInstrAnnot.h
@@ -10,6 +10,8 @@
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/Target/TargetRegInfo.h"
 
+#include <assert.h>
+
 class Value;
 class TmpInstruction;
 class CallInst;
diff --git a/llvm/include/llvm/CodeGen/SSARegMap.h b/llvm/include/llvm/CodeGen/SSARegMap.h
index 08fa672a816..ced04354cf4 100644
--- a/llvm/include/llvm/CodeGen/SSARegMap.h
+++ b/llvm/include/llvm/CodeGen/SSARegMap.h
@@ -12,6 +12,8 @@
 
 #include "llvm/Target/MRegisterInfo.h"
 
+#include <assert.h>
+
 class TargetRegisterClass;
 
 class SSARegMap {
diff --git a/llvm/include/llvm/Constant.h b/llvm/include/llvm/Constant.h
index a7ec6331bd5..322764797b3 100644
--- a/llvm/include/llvm/Constant.h
+++ b/llvm/include/llvm/Constant.h
@@ -7,6 +7,7 @@
 #ifndef LLVM_CONSTANT_H
 #define LLVM_CONSTANT_H
 
+#include <assert.h>
 #include "llvm/User.h"
 
 class Constant : public User {
diff --git a/llvm/include/llvm/ConstantHandling.h b/llvm/include/llvm/ConstantHandling.h
index 2401ad7596b..7589bb9a35c 100644
--- a/llvm/include/llvm/ConstantHandling.h
+++ b/llvm/include/llvm/ConstantHandling.h
@@ -33,6 +33,8 @@
 #ifndef LLVM_CONSTANTHANDLING_H
 #define LLVM_CONSTANTHANDLING_H
 
+#include <assert.h>
+
 #include "llvm/Constants.h"
 #include "llvm/Type.h"
 class PointerType;
diff --git a/llvm/include/llvm/Constants.h b/llvm/include/llvm/Constants.h
index 77c39452d18..07d516bc173 100644
--- a/llvm/include/llvm/Constants.h
+++ b/llvm/include/llvm/Constants.h
@@ -8,6 +8,8 @@
 #ifndef LLVM_CONSTANTS_H
 #define LLVM_CONSTANTS_H
 
+#include <assert.h>
+
 #include "llvm/Constant.h"
 #include "Support/DataTypes.h"
 
diff --git a/llvm/include/llvm/DerivedTypes.h b/llvm/include/llvm/DerivedTypes.h
index 3e9450ab7fd..ed1856f770b 100644
--- a/llvm/include/llvm/DerivedTypes.h
+++ b/llvm/include/llvm/DerivedTypes.h
@@ -11,6 +11,8 @@
 #ifndef LLVM_DERIVED_TYPES_H
 #define LLVM_DERIVED_TYPES_H
 
+#include <assert.h>
+
 #include "llvm/Type.h"
 
 class DerivedType : public Type {
diff --git a/llvm/include/llvm/GlobalVariable.h b/llvm/include/llvm/GlobalVariable.h
index 6fb74a3dbef..c32b15c2d5a 100644
--- a/llvm/include/llvm/GlobalVariable.h
+++ b/llvm/include/llvm/GlobalVariable.h
@@ -13,6 +13,8 @@
 #ifndef LLVM_GLOBAL_VARIABLE_H
 #define LLVM_GLOBAL_VARIABLE_H
 
+#include <assert.h>
+
 #include "llvm/GlobalValue.h"
 class Module;
 class Constant;
diff --git a/llvm/include/llvm/Instruction.h b/llvm/include/llvm/Instruction.h
index 5f61b2d4108..aaf2d72a30a 100644
--- a/llvm/include/llvm/Instruction.h
+++ b/llvm/include/llvm/Instruction.h
@@ -8,6 +8,8 @@
 #ifndef LLVM_INSTRUCTION_H
 #define LLVM_INSTRUCTION_H
 
+#include <assert.h>
+
 #include "llvm/User.h"
 template<typename SC> struct ilist_traits;
 template<typename ValueSubClass, typename ItemParentClass, typename SymTabClass,
diff --git a/llvm/include/llvm/Pass.h b/llvm/include/llvm/Pass.h
index 344baa02bae..dbcbac8b395 100644
--- a/llvm/include/llvm/Pass.h
+++ b/llvm/include/llvm/Pass.h
@@ -22,6 +22,8 @@
 #ifndef LLVM_PASS_H
 #define LLVM_PASS_H
 
+#include <assert.h>
+
 #include <vector>
 #include <map>
 #include <iosfwd>
diff --git a/llvm/include/llvm/PassAnalysisSupport.h b/llvm/include/llvm/PassAnalysisSupport.h
index 38987b56159..5b382703be2 100644
--- a/llvm/include/llvm/PassAnalysisSupport.h
+++ b/llvm/include/llvm/PassAnalysisSupport.h
@@ -14,7 +14,7 @@
 
 // No need to include Pass.h, we are being included by it!
 
-
+#include <assert.h>
 
 //===----------------------------------------------------------------------===//
 // AnalysisUsage - Represent the analysis usage information of a pass.  This
diff --git a/llvm/include/llvm/PassSupport.h b/llvm/include/llvm/PassSupport.h
index 16115cf5f35..2f6c316227a 100644
--- a/llvm/include/llvm/PassSupport.h
+++ b/llvm/include/llvm/PassSupport.h
@@ -14,6 +14,8 @@
 #ifndef LLVM_PASS_SUPPORT_H
 #define LLVM_PASS_SUPPORT_H
 
+#include <assert.h>
+
 // No need to include Pass.h, we are being included by it!
 
 class TargetMachine;
diff --git a/llvm/include/llvm/Support/CFG.h b/llvm/include/llvm/Support/CFG.h
index aab0db9712b..7e2774a6883 100644
--- a/llvm/include/llvm/Support/CFG.h
+++ b/llvm/include/llvm/Support/CFG.h
@@ -13,6 +13,8 @@
 #include "llvm/InstrTypes.h"
 #include "Support/iterator"
 
+#include <assert.h>
+
 //===--------------------------------------------------------------------===//
 // BasicBlock pred_iterator definition
 //===--------------------------------------------------------------------===//
diff --git a/llvm/include/llvm/Support/InstVisitor.h b/llvm/include/llvm/Support/InstVisitor.h
index 7141c2fb267..e4508a366f5 100644
--- a/llvm/include/llvm/Support/InstVisitor.h
+++ b/llvm/include/llvm/Support/InstVisitor.h
@@ -44,6 +44,8 @@
 #define LLVM_SUPPORT_INSTVISITOR_H
 
 #include "llvm/Instruction.h"
+#include <assert.h>
+
 class Module;
 
 // We operate on opaque instruction classes, so forward declare all instruction
diff --git a/llvm/include/llvm/Support/PassNameParser.h b/llvm/include/llvm/Support/PassNameParser.h
index c324161f308..a1d525f21a3 100644
--- a/llvm/include/llvm/Support/PassNameParser.h
+++ b/llvm/include/llvm/Support/PassNameParser.h
@@ -20,6 +20,7 @@
 #include "llvm/Pass.h"
 #include <algorithm>
 #include <iostream>
+#include <assert.h>
 
 //===----------------------------------------------------------------------===//
 // PassNameParser class - Make use of the pass registration mechanism to
diff --git a/llvm/include/llvm/SymbolTable.h b/llvm/include/llvm/SymbolTable.h
index fc5f470a65f..4f4784743ec 100644
--- a/llvm/include/llvm/SymbolTable.h
+++ b/llvm/include/llvm/SymbolTable.h
@@ -16,6 +16,8 @@
 #ifndef LLVM_SYMBOL_TABLE_H
 #define LLVM_SYMBOL_TABLE_H
 
+#include <assert.h>
+
 #include "llvm/Value.h"
 #include <map>
 
diff --git a/llvm/include/llvm/Target/TargetCacheInfo.h b/llvm/include/llvm/Target/TargetCacheInfo.h
index 5eb9fdecdc3..6d5d374d2c1 100644
--- a/llvm/include/llvm/Target/TargetCacheInfo.h
+++ b/llvm/include/llvm/Target/TargetCacheInfo.h
@@ -8,6 +8,8 @@
 #define LLVM_TARGET_TARGETCACHEINFO_H
 
 #include "Support/DataTypes.h"
+#include <assert.h>
+
 class TargetMachine;
 
 struct TargetCacheInfo {
diff --git a/llvm/include/llvm/Target/TargetInstrInfo.h b/llvm/include/llvm/Target/TargetInstrInfo.h
index 806132e9d41..33ccc2b51af 100644
--- a/llvm/include/llvm/Target/TargetInstrInfo.h
+++ b/llvm/include/llvm/Target/TargetInstrInfo.h
@@ -9,6 +9,7 @@
 
 #include "Support/DataTypes.h"
 #include <vector>
+#include <assert.h>
 
 class MachineInstr;
 class TargetMachine;
diff --git a/llvm/include/llvm/Target/TargetRegInfo.h b/llvm/include/llvm/Target/TargetRegInfo.h
index 7808efca07f..1b8c48186bb 100644
--- a/llvm/include/llvm/Target/TargetRegInfo.h
+++ b/llvm/include/llvm/Target/TargetRegInfo.h
@@ -10,6 +10,7 @@
 
 #include "Support/hash_map"
 #include <string>
+#include <assert.h>
 
 class TargetMachine;
 class IGNode;
diff --git a/llvm/include/llvm/Target/TargetSchedInfo.h b/llvm/include/llvm/Target/TargetSchedInfo.h
index 5d42d40bcbd..b978cdfcccd 100644
--- a/llvm/include/llvm/Target/TargetSchedInfo.h
+++ b/llvm/include/llvm/Target/TargetSchedInfo.h
@@ -10,6 +10,7 @@
 #include "llvm/Target/TargetInstrInfo.h"
 #include "Support/hash_map"
 #include <string>
+#include <assert.h>
 
 typedef long long cycles_t; 
 static const cycles_t HUGE_LATENCY = ~((long long) 1 << (sizeof(cycles_t)-2));
diff --git a/llvm/include/llvm/User.h b/llvm/include/llvm/User.h
index ce68c410e67..751cdaf5ff9 100644
--- a/llvm/include/llvm/User.h
+++ b/llvm/include/llvm/User.h
@@ -12,6 +12,8 @@
 #ifndef LLVM_USER_H
 #define LLVM_USER_H
 
+#include <assert.h>
+
 #include "llvm/Value.h"
 
 class User : public Value {
diff --git a/llvm/include/llvm/iOther.h b/llvm/include/llvm/iOther.h
index 45b8db367d8..123aa0ac708 100644
--- a/llvm/include/llvm/iOther.h
+++ b/llvm/include/llvm/iOther.h
@@ -8,6 +8,8 @@
 #ifndef LLVM_IOTHER_H
 #define LLVM_IOTHER_H
 
+#include <assert.h>
+
 #include "llvm/InstrTypes.h"
 
 //===----------------------------------------------------------------------===//
diff --git a/llvm/include/llvm/iPHINode.h b/llvm/include/llvm/iPHINode.h
index eba5a735542..1f6e5582d22 100644
--- a/llvm/include/llvm/iPHINode.h
+++ b/llvm/include/llvm/iPHINode.h
@@ -7,6 +7,8 @@
 #ifndef LLVM_IPHINODE_H
 #define LLVM_IPHINODE_H
 
+#include <assert.h>
+
 #include "llvm/Instruction.h"
 class BasicBlock;
 
diff --git a/llvm/include/llvm/iTerminators.h b/llvm/include/llvm/iTerminators.h
index 35b07171ff1..312519eb45f 100644
--- a/llvm/include/llvm/iTerminators.h
+++ b/llvm/include/llvm/iTerminators.h
@@ -9,6 +9,8 @@
 #ifndef LLVM_ITERMINATORS_H
 #define LLVM_ITERMINATORS_H
 
+#include <assert.h>
+
 #include "llvm/InstrTypes.h"
 
 //===---------------------------------------------------------------------------