Merge i*.h headers into Instructions.h as part of bug403.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15325 91177308-0d34-0410-b5e6-96231b3b80d8

5 files changed, 5 insertions, 6 deletions

diff --git a/lib/VMCore/iBranch.cpp b/lib/VMCore/iBranch.cpp
index e0bdcf7..b2e0f29 100644
--- a/lib/VMCore/iBranch.cpp
+++ b/lib/VMCore/iBranch.cpp
@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/iTerminators.h"
+#include "llvm/Instructions.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/Type.h"
 using namespace llvm;
diff --git a/lib/VMCore/iCall.cpp b/lib/VMCore/iCall.cpp
index b639314..12dc9cb 100644
--- a/lib/VMCore/iCall.cpp
+++ b/lib/VMCore/iCall.cpp
@@ -11,8 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/iOther.h"
-#include "llvm/iTerminators.h"
+#include "llvm/Instructions.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Function.h"
diff --git a/lib/VMCore/iMemory.cpp b/lib/VMCore/iMemory.cpp
index 3fd0282..0cee6ac 100644
--- a/lib/VMCore/iMemory.cpp
+++ b/lib/VMCore/iMemory.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/iMemory.h"
+#include "llvm/Instructions.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 using namespace llvm;
diff --git a/lib/VMCore/iOperators.cpp b/lib/VMCore/iOperators.cpp
index c33d797..6665368 100644
--- a/lib/VMCore/iOperators.cpp
+++ b/lib/VMCore/iOperators.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/iOperators.h"
+#include "llvm/Instructions.h"
 #include "llvm/Type.h"
 #include "llvm/Constants.h"
 #include "llvm/BasicBlock.h"
diff --git a/lib/VMCore/iSwitch.cpp b/lib/VMCore/iSwitch.cpp
index b78cfbb..1998b7f 100644
--- a/lib/VMCore/iSwitch.cpp
+++ b/lib/VMCore/iSwitch.cpp
@@ -11,7 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/iTerminators.h"
+#include "llvm/Instructions.h"
 #include "llvm/BasicBlock.h"
 using namespace llvm;