diff --git a/include/llvm/CodeGen/PseudoSourceValue.h b/include/llvm/CodeGen/PseudoSourceValue.h
index 1a1dde9d559..7b3b0381f77 100644
--- a/include/llvm/CodeGen/PseudoSourceValue.h
+++ b/include/llvm/CodeGen/PseudoSourceValue.h
@@ -15,7 +15,6 @@
 #define LLVM_CODEGEN_PSEUDOSOURCEVALUE_H
 
 #include "llvm/Value.h"
-#include "llvm/Support/raw_ostream.h"
 
 namespace llvm {
   class MachineFrameInfo;
@@ -103,11 +102,9 @@ namespace llvm {
 
     virtual bool mayAlias(const MachineFrameInfo *) const;
 
-    virtual void printCustom(raw_ostream &OS) const {
-      OS << "FixedStack" << FI;
-    }
+    virtual void printCustom(raw_ostream &OS) const;
 
-    int getFrameIndex(void) const { return FI; }
+    int getFrameIndex() const { return FI; }
   };
 } // End llvm namespace
 
diff --git a/lib/CodeGen/PseudoSourceValue.cpp b/lib/CodeGen/PseudoSourceValue.cpp
index e95f017fc39..7fb3e6e6d2d 100644
--- a/lib/CodeGen/PseudoSourceValue.cpp
+++ b/lib/CodeGen/PseudoSourceValue.cpp
@@ -109,3 +109,7 @@ bool FixedStackPseudoSourceValue::mayAlias(const MachineFrameInfo *MFI) const {
   // Spill slots will not alias any LLVM IR value.
   return !MFI->isSpillSlotObjectIndex(FI);
 }
+
+void FixedStackPseudoSourceValue::printCustom(raw_ostream &OS) const {
+  OS << "FixedStack" << FI;
+}