diff --git a/lib/Target/AVR/CMakeLists.txt b/lib/Target/AVR/CMakeLists.txt
index a0e7bcf73dd..4b8354d6487 100644
--- a/lib/Target/AVR/CMakeLists.txt
+++ b/lib/Target/AVR/CMakeLists.txt
@@ -16,5 +16,6 @@ add_llvm_target(AVRCodeGen
 
 add_dependencies(LLVMAVRCodeGen intrinsics_gen)
 
+add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
 
diff --git a/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.cpp b/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.cpp
index 74d6217838a..481de320b22 100644
--- a/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.cpp
+++ b/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.cpp
@@ -3,6 +3,10 @@
 #include "llvm/Support/ELF.h"
 #include "llvm/Support/FormattedStream.h"
 
+#include "AVRMCTargetDesc.h"
+
+namespace llvm {
+
 static unsigned getEFlagsForFeatureSet(const FeatureBitset &Features) {
   unsigned EFlags = 0;
 
@@ -52,9 +56,11 @@ AVRELFStreamer::AVRELFStreamer(MCStreamer &S,
     : AVRTargetStreamer(S) {
 
   MCAssembler &MCA = getStreamer().getAssembler();
-  unsigned EFlags = MCA.getELFHeaderEFlags(Features);
+  unsigned EFlags = MCA.getELFHeaderEFlags();
 
-  EFlags |= getEFlagsForFeatureSet(STI.getFeatureBits())
+  EFlags |= getEFlagsForFeatureSet(STI.getFeatureBits());
 
   MCA.setELFHeaderEFlags(EFlags);
 }
+
+} // end namespace llvm
diff --git a/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.h b/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.h
index b0619f88485..e5df6cc34e4 100644
--- a/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.h
+++ b/lib/Target/AVR/MCTargetDesc/AVRELFStreamer.h
@@ -12,7 +12,7 @@
 
 #include "AVRTargetStreamer.h"
 
-#include "llvm/MC/MCELFStreamer.h"
+namespace llvm {
 
 /// A target streamer for an AVR ELF object file.
 class AVRELFStreamer : public AVRTargetStreamer {
@@ -24,4 +24,6 @@ public:
   }
 };
 
+} // end namespace llvm
+
 #endif
diff --git a/lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.cpp b/lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.cpp
new file mode 100644
index 00000000000..a2d8c16eeb8
--- /dev/null
+++ b/lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.cpp
@@ -0,0 +1,24 @@
+//===-- AVRTargetStreamer.cpp - AVR Target Streamer Methods ---------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file provides AVR specific target streamer methods.
+//
+//===----------------------------------------------------------------------===//
+
+#include "AVRTargetStreamer.h"
+
+namespace llvm {
+
+AVRTargetStreamer::AVRTargetStreamer(MCStreamer &S) : MCTargetStreamer(S) {}
+
+AVRTargetAsmStreamer::AVRTargetAsmStreamer(MCStreamer &S)
+    : AVRTargetStreamer(S) {}
+
+} // end namespace llvm
+
diff --git a/lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.h b/lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.h
index 082d5ea82fa..99a536699ae 100644
--- a/lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.h
+++ b/lib/Target/AVR/MCTargetDesc/AVRTargetStreamer.h
@@ -10,6 +10,8 @@
 #ifndef LLVM_AVR_TARGET_STREAMER_H
 #define LLVM_AVR_TARGET_STREAMER_H
 
+#include "llvm/MC/MCELFStreamer.h"
+
 namespace llvm {
 class MCStreamer;
 
diff --git a/lib/Target/AVR/MCTargetDesc/CMakeLists.txt b/lib/Target/AVR/MCTargetDesc/CMakeLists.txt
index 372dcc238f8..1ef14f307df 100644
--- a/lib/Target/AVR/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/AVR/MCTargetDesc/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_llvm_library(LLVMAVRDesc
-  AVRTargetStreamer.cpp
   AVRELFStreamer.cpp
+  AVRTargetStreamer.cpp
 )
 
 add_dependencies(LLVMAVRDesc AVRCommonTableGen)