Index: include/llvm/DebugInfo/Symbolize/Symbolize.h
===================================================================
--- include/llvm/DebugInfo/Symbolize/Symbolize.h
+++ include/llvm/DebugInfo/Symbolize/Symbolize.h
@@ -1,4 +1,4 @@
-//===-- LLVMSymbolize.h ----------------------------------------- C++ -----===//
+//===-- Symbolize.h --------------------------------------------- C++ -----===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -10,8 +10,8 @@
 // Header for LLVM symbolization library.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_SYMBOLIZER_LLVMSYMBOLIZE_H
-#define LLVM_TOOLS_LLVM_SYMBOLIZER_LLVMSYMBOLIZE_H
+#ifndef LLVM_DEBUGINFO_SYMBOLIZE_SYMBOLIZE_H
+#define LLVM_DEBUGINFO_SYMBOLIZE_SYMBOLIZE_H
 
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/DebugInfo/DIContext.h"
@@ -24,12 +24,10 @@
 #include <string>
 
 namespace llvm {
-
-typedef DILineInfoSpecifier::FunctionNameKind FunctionNameKind;
-using namespace object;
-
 namespace symbolize {
 
+using namespace object;
+using FunctionNameKind = DILineInfoSpecifier::FunctionNameKind;
 class ModuleInfo;
 
 class LLVMSymbolizer {
Index: lib/DebugInfo/CMakeLists.txt
===================================================================
--- lib/DebugInfo/CMakeLists.txt
+++ lib/DebugInfo/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 add_subdirectory(DWARF)
 add_subdirectory(PDB)
-
+add_subdirectory(Symbolize)
Index: lib/DebugInfo/LLVMBuild.txt
===================================================================
--- lib/DebugInfo/LLVMBuild.txt
+++ lib/DebugInfo/LLVMBuild.txt
@@ -16,7 +16,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = DWARF PDB
+subdirectories = DWARF PDB Symbolize
 
 [component_0]
 type = Group
Index: lib/DebugInfo/Makefile
===================================================================
--- lib/DebugInfo/Makefile
+++ lib/DebugInfo/Makefile
@@ -10,6 +10,6 @@
 
 include $(LEVEL)/Makefile.config
 
-PARALLEL_DIRS := DWARF PDB
+PARALLEL_DIRS := DWARF PDB Symbolize
 
-include $(LEVEL)/Makefile.common
\ No newline at end of file
+include $(LEVEL)/Makefile.common
Index: lib/DebugInfo/Symbolize/CMakeLists.txt
===================================================================
--- /dev/null
+++ lib/DebugInfo/Symbolize/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_llvm_library(LLVMSymbolize
+  Symbolize.cpp
+
+  ADDITIONAL_HEADER_DIRS
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DebugInfo/Symbolize
+  )
Index: lib/DebugInfo/Symbolize/LLVMBuild.txt
===================================================================
--- lib/DebugInfo/Symbolize/LLVMBuild.txt
+++ lib/DebugInfo/Symbolize/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/DebugInfo/LLVMBuild.txt ----------------------------*- Conf -*--===;
+;===- ./lib/DebugInfo/Symbolize/LLVMBuild.txt ------------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -15,10 +15,8 @@
 ;
 ;===------------------------------------------------------------------------===;
 
-[common]
-subdirectories = DWARF PDB
-
 [component_0]
-type = Group
-name = DebugInfo
-parent = $ROOT
+type = Library
+name = Symbolize
+parent = DebugInfo
+required_libraries = DebugInfoDWARF DebugInfoPDB Object Support
Index: lib/DebugInfo/Symbolize/Makefile
===================================================================
--- lib/DebugInfo/Symbolize/Makefile
+++ lib/DebugInfo/Symbolize/Makefile
@@ -1,4 +1,4 @@
-##===- lib/DebugInfo/Makefile ------------------------------*- Makefile -*-===##
+##===- lib/DebugInfo/Symbolize/Makefile --------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -6,10 +6,10 @@
 # License. See LICENSE.TXT for details.
 #
 ##===----------------------------------------------------------------------===##
-LEVEL = ../..
 
-include $(LEVEL)/Makefile.config
+LEVEL = ../../..
+LIBRARYNAME = LLVMSymbolize
+BUILD_ARCHIVE := 1
 
-PARALLEL_DIRS := DWARF PDB
+include $(LEVEL)/Makefile.common
 
-include $(LEVEL)/Makefile.common
\ No newline at end of file
Index: lib/DebugInfo/Symbolize/Symbolize.cpp
===================================================================
--- lib/DebugInfo/Symbolize/Symbolize.cpp
+++ lib/DebugInfo/Symbolize/Symbolize.cpp
@@ -11,7 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "LLVMSymbolize.h"
+#include "llvm/DebugInfo/Symbolize/Symbolize.h"
+
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Config/config.h"
 #include "llvm/DebugInfo/DWARF/DWARFContext.h"
@@ -45,6 +46,7 @@
 namespace llvm {
 namespace symbolize {
 
+// FIXME: Move this to llvm-symbolizer tool.
 static bool error(std::error_code ec) {
   if (!ec)
     return false;
Index: tools/llvm-symbolizer/CMakeLists.txt
===================================================================
--- tools/llvm-symbolizer/CMakeLists.txt
+++ tools/llvm-symbolizer/CMakeLists.txt
@@ -8,9 +8,9 @@
   DebugInfoPDB
   Object
   Support
+  Symbolize
   )
 
 add_llvm_tool(llvm-symbolizer
-  LLVMSymbolize.cpp
   llvm-symbolizer.cpp
   )
Index: tools/llvm-symbolizer/Makefile
===================================================================
--- tools/llvm-symbolizer/Makefile
+++ tools/llvm-symbolizer/Makefile
@@ -9,7 +9,7 @@
 
 LEVEL := ../..
 TOOLNAME := llvm-symbolizer
-LINK_COMPONENTS := DebugInfoDWARF DebugInfoPDB Object
+LINK_COMPONENTS := DebugInfoDWARF DebugInfoPDB Object Support Symbolize
 
 # This tool has no plugins, optimize startup time.
 TOOL_NO_EXPORTS := 1
Index: tools/llvm-symbolizer/llvm-symbolizer.cpp
===================================================================
--- tools/llvm-symbolizer/llvm-symbolizer.cpp
+++ tools/llvm-symbolizer/llvm-symbolizer.cpp
@@ -15,8 +15,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "LLVMSymbolize.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/DebugInfo/Symbolize/Symbolize.h"
 #include "llvm/Support/COM.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"