diff --git a/lib/MC/CMakeLists.txt b/lib/MC/CMakeLists.txt
index 5eac6e0e537..8075392c346 100644
--- a/lib/MC/CMakeLists.txt
+++ b/lib/MC/CMakeLists.txt
@@ -1,4 +1,7 @@
 add_llvm_library(LLVMMC
+  MCAsmInfo.cpp
+  MCAsmInfoCOFF.cpp
+  MCAsmInfoDarwin.cpp
   MCAsmLexer.cpp
   MCAsmParser.cpp
   MCAsmStreamer.cpp
diff --git a/lib/Target/CMakeLists.txt b/lib/Target/CMakeLists.txt
index a21ccd590c7..888c1a3c00e 100644
--- a/lib/Target/CMakeLists.txt
+++ b/lib/Target/CMakeLists.txt
@@ -1,9 +1,6 @@
 add_llvm_library(LLVMTarget
-  COFFTargetAsmInfo.cpp
-  DarwinTargetAsmInfo.cpp
   SubtargetFeature.cpp
   Target.cpp
-  TargetAsmInfo.cpp
   TargetData.cpp
   TargetELFWriterInfo.cpp
   TargetFrameInfo.cpp
diff --git a/lib/Target/Mips/MipsMCAsmInfo.cpp b/lib/Target/Mips/MipsMCAsmInfo.cpp
index d0bd87c21f1..60ef1c9e4fe 100644
--- a/lib/Target/Mips/MipsMCAsmInfo.cpp
+++ b/lib/Target/Mips/MipsMCAsmInfo.cpp
@@ -19,7 +19,7 @@ MipsMCAsmInfo::MipsMCAsmInfo(const Target &T, const StringRef &TT) {
   COMMDirectiveTakesAlignment = true;
   Data16bitsDirective         = "\t.half\t";
   Data32bitsDirective         = "\t.word\t";
-  Data64bitsDirective         = NULL;
+  Data64bitsDirective         = 0;
   PrivateGlobalPrefix         = "$";
   CommentString               = "#";
   ZeroDirective               = "\t.space\t";