diff --git a/llvm/tools/llvm-dwp/DWP.h b/llvm/include/llvm/DWP/DWP.h
rename from llvm/tools/llvm-dwp/DWP.h
rename to llvm/include/llvm/DWP/DWP.h
--- a/llvm/tools/llvm-dwp/DWP.h
+++ b/llvm/include/llvm/DWP/DWP.h
@@ -1,5 +1,5 @@
-#ifndef LLVM_TOOLS_LLVM_DWP_DWP_H
-#define LLVM_TOOLS_LLVM_DWP_DWP_H
+#ifndef LLVM_DWP_DWP_H
+#define LLVM_DWP_DWP_H
 
 #include "DWPStringPool.h"
 #include "llvm/ADT/ArrayRef.h"
@@ -94,4 +94,4 @@
                 uint32_t IndexVersion);
 
 } // namespace llvm
-#endif // LLVM_TOOLS_LLVM_DWP_DWP_H
+#endif // LLVM_DWP_DWP_H
diff --git a/llvm/tools/llvm-dwp/DWPError.h b/llvm/include/llvm/DWP/DWPError.h
rename from llvm/tools/llvm-dwp/DWPError.h
rename to llvm/include/llvm/DWP/DWPError.h
--- a/llvm/tools/llvm-dwp/DWPError.h
+++ b/llvm/include/llvm/DWP/DWPError.h
@@ -1,5 +1,5 @@
-#ifndef TOOLS_LLVM_DWP_DWPERROR
-#define TOOLS_LLVM_DWP_DWPERROR
+#ifndef LLVM_DWP_DWPERROR_H
+#define LLVM_DWP_DWPERROR_H
 
 #include "llvm/Support/Error.h"
 #include "llvm/Support/ErrorHandling.h"
@@ -20,4 +20,4 @@
 };
 } // namespace llvm
 
-#endif
+#endif // LLVM_DWP_DWPERROR_H
diff --git a/llvm/tools/llvm-dwp/DWPStringPool.h b/llvm/include/llvm/DWP/DWPStringPool.h
rename from llvm/tools/llvm-dwp/DWPStringPool.h
rename to llvm/include/llvm/DWP/DWPStringPool.h
--- a/llvm/tools/llvm-dwp/DWPStringPool.h
+++ b/llvm/include/llvm/DWP/DWPStringPool.h
@@ -1,5 +1,5 @@
-#ifndef TOOLS_LLVM_DWP_DWPSTRINGPOOL
-#define TOOLS_LLVM_DWP_DWPSTRINGPOOL
+#ifndef LLVM_DWP_DWPSTRINGPOOL_H
+#define LLVM_DWP_DWPSTRINGPOOL_H
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/MC/MCSection.h"
@@ -53,4 +53,4 @@
 };
 } // namespace llvm
 
-#endif
+#endif // LLVM_DWP_DWPSTRINGPOOL_H
diff --git a/llvm/lib/CMakeLists.txt b/llvm/lib/CMakeLists.txt
--- a/llvm/lib/CMakeLists.txt
+++ b/llvm/lib/CMakeLists.txt
@@ -26,6 +26,7 @@
 add_subdirectory(Option)
 add_subdirectory(Remarks)
 add_subdirectory(DebugInfo)
+add_subdirectory(DWP)
 add_subdirectory(ExecutionEngine)
 add_subdirectory(Target)
 add_subdirectory(AsmParser)
diff --git a/llvm/lib/DWP/CMakeLists.txt b/llvm/lib/DWP/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/llvm/lib/DWP/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_llvm_component_library(LLVMDWP
+  DWP.cpp
+  DWPError.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWP
+
+  DEPENDS
+  intrinsics_gen
+
+  LINK_COMPONENTS
+  DebugInfoDWARF
+  MC
+  Object
+  Support
+  Target
+)
diff --git a/llvm/tools/llvm-dwp/DWP.cpp b/llvm/lib/DWP/DWP.cpp
rename from llvm/tools/llvm-dwp/DWP.cpp
rename to llvm/lib/DWP/DWP.cpp
--- a/llvm/tools/llvm-dwp/DWP.cpp
+++ b/llvm/lib/DWP/DWP.cpp
@@ -10,8 +10,8 @@
 // package files).
 //
 //===----------------------------------------------------------------------===//
-#include "DWP.h"
-#include "DWPError.h"
+#include "llvm/DWP/DWP.h"
+#include "llvm/DWP/DWPError.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCObjectFileInfo.h"
 #include "llvm/MC/MCTargetOptionsCommandFlags.h"
diff --git a/llvm/tools/llvm-dwp/DWPError.cpp b/llvm/lib/DWP/DWPError.cpp
rename from llvm/tools/llvm-dwp/DWPError.cpp
rename to llvm/lib/DWP/DWPError.cpp
--- a/llvm/tools/llvm-dwp/DWPError.cpp
+++ b/llvm/lib/DWP/DWPError.cpp
@@ -1,3 +1,3 @@
-#include "DWPError.h"
+#include "llvm/DWP/DWPError.h"
 using namespace llvm;
 char DWPError::ID;
diff --git a/llvm/tools/llvm-dwp/CMakeLists.txt b/llvm/tools/llvm-dwp/CMakeLists.txt
--- a/llvm/tools/llvm-dwp/CMakeLists.txt
+++ b/llvm/tools/llvm-dwp/CMakeLists.txt
@@ -1,20 +1,16 @@
 set(LLVM_LINK_COMPONENTS
-  AllTargetsAsmParsers
   AllTargetsCodeGens
   AllTargetsDescs
   AllTargetsInfos
-  AsmPrinter
   DebugInfoDWARF
+  DWP
   MC
   Object
   Support
-  Target
   )
 
 add_llvm_tool(llvm-dwp
   llvm-dwp.cpp
-  DWP.cpp
-  DWPError.cpp
 
   DEPENDS
   intrinsics_gen
diff --git a/llvm/tools/llvm-dwp/llvm-dwp.cpp b/llvm/tools/llvm-dwp/llvm-dwp.cpp
--- a/llvm/tools/llvm-dwp/llvm-dwp.cpp
+++ b/llvm/tools/llvm-dwp/llvm-dwp.cpp
@@ -10,9 +10,9 @@
 // package files).
 //
 //===----------------------------------------------------------------------===//
-#include "DWP.h"
-#include "DWPError.h"
-#include "DWPStringPool.h"
+#include "llvm/DWP/DWP.h"
+#include "llvm/DWP/DWPError.h"
+#include "llvm/DWP/DWPStringPool.h"
 #include "llvm/MC/MCAsmBackend.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCCodeEmitter.h"