diff --git a/lib/MC/MCAsmLexer.cpp b/lib/MC/MCAsmLexer.cpp
index c5365b7a956..1e34ed6f790 100644
--- a/lib/MC/MCAsmLexer.cpp
+++ b/lib/MC/MCAsmLexer.cpp
@@ -8,6 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/MC/MCAsmLexer.h"
+#include "llvm/Support/SourceMgr.h"
 
 using namespace llvm;
 
@@ -16,3 +17,7 @@ MCAsmLexer::MCAsmLexer() : CurTok(AsmToken::Error, StringRef()) {
 
 MCAsmLexer::~MCAsmLexer() {
 }
+
+SMLoc AsmToken::getLoc() const {
+  return SMLoc::getFromPointer(Str.data());
+}
diff --git a/tools/llvm-mc/AsmLexer.cpp b/tools/llvm-mc/AsmLexer.cpp
index 5b394b6cc46..27454ee922c 100644
--- a/tools/llvm-mc/AsmLexer.cpp
+++ b/tools/llvm-mc/AsmLexer.cpp
@@ -34,10 +34,6 @@ SMLoc AsmLexer::getLoc() const {
   return SMLoc::getFromPointer(TokStart);
 }
 
-SMLoc AsmToken::getLoc() const {
-  return SMLoc::getFromPointer(Str.data());
-}
-
 void AsmLexer::PrintMessage(SMLoc Loc, const std::string &Msg, 
                             const char *Type) const {
   SrcMgr.PrintMessage(Loc, Msg, Type);