diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h
index 58de3e81867..82520ce1911 100644
--- a/include/llvm/Support/raw_ostream.h
+++ b/include/llvm/Support/raw_ostream.h
@@ -94,17 +94,7 @@ public:
 
   /// SetBufferSize - Set the internal buffer size to the specified amount
   /// instead of the default.
-  void SetBufferSize(size_t Size=4096) {
-    assert(Size >= 64 &&
-           "Buffer size must be somewhat large for invariants to hold");
-    flush();
-
-    delete [] OutBufStart;
-    OutBufStart = new char[Size];
-    OutBufEnd = OutBufStart+Size;
-    OutBufCur = OutBufStart;
-    Unbuffered = false;
-  }
+  void SetBufferSize(size_t Size=4096);
 
   size_t GetBufferSize() const {
     return OutBufEnd - OutBufStart;
@@ -114,13 +104,7 @@ public:
   /// unbuffered the stream will flush after every write. This routine
   /// will also flush the buffer immediately when the stream is being
   /// set to unbuffered.
-  void SetUnbuffered() {
-    flush();
-    
-    delete [] OutBufStart;
-    OutBufStart = OutBufEnd = OutBufCur = 0;
-    Unbuffered = true;
-  }
+  void SetUnbuffered();
 
   size_t GetNumBytesInBuffer() const {
     return OutBufCur - OutBufStart;
diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp
index 11a11bd930a..2a2458d61a3 100644
--- a/lib/Support/raw_ostream.cpp
+++ b/lib/Support/raw_ostream.cpp
@@ -63,6 +63,26 @@ raw_ostream::~raw_ostream() {
 // An out of line virtual method to provide a home for the class vtable.
 void raw_ostream::handle() {}
 
+void raw_ostream::SetBufferSize(size_t Size) {
+  assert(Size >= 64 &&
+         "Buffer size must be somewhat large for invariants to hold");
+  flush();
+
+  delete [] OutBufStart;
+  OutBufStart = new char[Size];
+  OutBufEnd = OutBufStart+Size;
+  OutBufCur = OutBufStart;
+  Unbuffered = false;
+}
+
+void raw_ostream::SetUnbuffered() {
+  flush();
+
+  delete [] OutBufStart;
+  OutBufStart = OutBufEnd = OutBufCur = 0;
+  Unbuffered = true;
+}
+
 raw_ostream &raw_ostream::operator<<(unsigned long N) {
   // Zero is a special case.
   if (N == 0)