diff --git a/llvm/lib/Target/DirectX/CMakeLists.txt b/llvm/lib/Target/DirectX/CMakeLists.txt
--- a/llvm/lib/Target/DirectX/CMakeLists.txt
+++ b/llvm/lib/Target/DirectX/CMakeLists.txt
@@ -27,16 +27,22 @@
   DXILResourceAnalysis.cpp
   DXILShaderFlags.cpp
   DXILTranslateMetadata.cpp
-  PointerTypeAnalysis.cpp
 
   LINK_COMPONENTS
+  Analysis
   AsmPrinter
   Core
+  CodeGen
   SelectionDAG
   Support
+  DirectXDesc
   DirectXInfo
+  DirectXPointerTypeAnalysis
   DXILBitWriter
   FrontendHLSL
+  MC
+  Target
+  TransformUtils
 
   ADD_TO_COMPONENT
   DirectX
@@ -44,4 +50,5 @@
 
 add_subdirectory(MCTargetDesc)
 add_subdirectory(TargetInfo)
+add_subdirectory(PointerTypeAnalysis)
 add_subdirectory(DXILWriter)
diff --git a/llvm/lib/Target/DirectX/DXILPrepare.cpp b/llvm/lib/Target/DirectX/DXILPrepare.cpp
--- a/llvm/lib/Target/DirectX/DXILPrepare.cpp
+++ b/llvm/lib/Target/DirectX/DXILPrepare.cpp
@@ -12,7 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "DirectX.h"
-#include "PointerTypeAnalysis.h"
+#include "PointerTypeAnalysis/PointerTypeAnalysis.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/CodeGen/Passes.h"
diff --git a/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt b/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt
--- a/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt
+++ b/llvm/lib/Target/DirectX/DXILWriter/CMakeLists.txt
@@ -9,8 +9,10 @@
   intrinsics_gen
 
   LINK_COMPONENTS
+  Analysis
   BitWriter
   Core
+  DirectXPointerTypeAnalysis
   MC
   Object
   Support
diff --git a/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp b/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp
--- a/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp
+++ b/llvm/lib/Target/DirectX/DXILWriter/DXILBitcodeWriter.cpp
@@ -12,7 +12,7 @@
 
 #include "DXILBitcodeWriter.h"
 #include "DXILValueEnumerator.h"
-#include "PointerTypeAnalysis.h"
+#include "PointerTypeAnalysis/PointerTypeAnalysis.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/Bitcode/BitcodeCommon.h"
diff --git a/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt
--- a/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/Target/DirectX/MCTargetDesc/CMakeLists.txt
@@ -4,6 +4,7 @@
 
   LINK_COMPONENTS
   DirectXInfo
+  MC
   Support
 
   ADD_TO_COMPONENT
diff --git a/llvm/lib/Target/DirectX/PointerTypeAnalysis/CMakeLists.txt b/llvm/lib/Target/DirectX/PointerTypeAnalysis/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/llvm/lib/Target/DirectX/PointerTypeAnalysis/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_llvm_component_library(LLVMDirectXPointerTypeAnalysis
+  PointerTypeAnalysis.cpp
+
+  LINK_COMPONENTS
+  Core
+  Support
+
+  ADD_TO_COMPONENT
+  DirectX
+  )
diff --git a/llvm/lib/Target/DirectX/PointerTypeAnalysis.h b/llvm/lib/Target/DirectX/PointerTypeAnalysis/PointerTypeAnalysis.h
rename from llvm/lib/Target/DirectX/PointerTypeAnalysis.h
rename to llvm/lib/Target/DirectX/PointerTypeAnalysis/PointerTypeAnalysis.h
diff --git a/llvm/lib/Target/DirectX/PointerTypeAnalysis.cpp b/llvm/lib/Target/DirectX/PointerTypeAnalysis/PointerTypeAnalysis.cpp
rename from llvm/lib/Target/DirectX/PointerTypeAnalysis.cpp
rename to llvm/lib/Target/DirectX/PointerTypeAnalysis/PointerTypeAnalysis.cpp