s/Method/Function
Remove extraneous #includes of llvm/Assembly/Writer

llvm-svn: 2178
diff --git a/llvm/lib/Transforms/IPO/InlineSimple.cpp b/llvm/lib/Transforms/IPO/InlineSimple.cpp
index d720c3c..461f597 100644
--- a/llvm/lib/Transforms/IPO/InlineSimple.cpp
+++ b/llvm/lib/Transforms/IPO/InlineSimple.cpp
@@ -22,13 +22,12 @@
 #include "llvm/iTerminators.h"
 #include "llvm/iPHINode.h"
 #include "llvm/iOther.h"
+#include "llvm/Type.h"
 #include <algorithm>
 #include <map>
 #include <iostream>
 using std::cerr;
 
-#include "llvm/Assembly/Writer.h"
-
 // RemapInstruction - Convert the instruction operands from referencing the 
 // current values into those specified by ValueMap.
 //
diff --git a/llvm/lib/Transforms/IPO/MutateStructTypes.cpp b/llvm/lib/Transforms/IPO/MutateStructTypes.cpp
index 254588e..d6b37c0 100644
--- a/llvm/lib/Transforms/IPO/MutateStructTypes.cpp
+++ b/llvm/lib/Transforms/IPO/MutateStructTypes.cpp
@@ -35,9 +35,7 @@
 // To enable debugging, uncomment this...
 //#define DEBUG_MST(x) x
 
-#ifdef DEBUG_MST
-#include "llvm/Assembly/Writer.h"
-#else
+#ifndef DEBUG_MST
 #define DEBUG_MST(x)   // Disable debug code
 #endif
 
diff --git a/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp b/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp
index 168f839..5c64aa3 100644
--- a/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp
+++ b/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp
@@ -17,8 +17,6 @@
 using std::set;
 using std::pair;
 
-#include "llvm/Assembly/Writer.h"
-
 namespace {
   class SimpleStructMutation : public MutateStructTypes {
   public: