1 files changed, 8 insertions, 8 deletions
diff --git a/llvm/tools/llvm-pdbdump/PdbYaml.h b/llvm/tools/llvm-pdbdump/PdbYaml.h
index 91c0a585926..8a964a354c0 100644
--- a/llvm/tools/llvm-pdbdump/PdbYaml.h
+++ b/llvm/tools/llvm-pdbdump/PdbYaml.h
@@ -14,6 +14,7 @@
 
 #include "llvm/ADT/Optional.h"
 #include "llvm/DebugInfo/PDB/PDBTypes.h"
+#include "llvm/DebugInfo/PDB/Raw/MsfCommon.h"
 #include "llvm/DebugInfo/PDB/Raw/PDBFile.h"
 #include "llvm/DebugInfo/PDB/Raw/RawConstants.h"
 #include "llvm/Support/Endian.h"
@@ -26,16 +27,15 @@ namespace pdb {
 
 namespace yaml {
 struct MsfHeaders {
-  PDBFile::SuperBlock SuperBlock;
+  msf::SuperBlock SuperBlock;
   uint32_t NumDirectoryBlocks;
-  uint32_t BlockMapOffset;
-  std::vector<support::ulittle32_t> DirectoryBlocks;
+  std::vector<uint32_t> DirectoryBlocks;
   uint32_t NumStreams;
   uint32_t FileSize;
 };
 
 struct StreamBlockList {
-  std::vector<support::ulittle32_t> Blocks;
+  std::vector<uint32_t> Blocks;
 };
 
 struct PdbInfoStream {
@@ -57,7 +57,7 @@ struct PdbDbiStream {
 
 struct PdbObject {
   Optional<MsfHeaders> Headers;
-  Optional<std::vector<support::ulittle32_t>> StreamSizes;
+  Optional<std::vector<uint32_t>> StreamSizes;
   Optional<std::vector<StreamBlockList>> StreamMap;
   Optional<PdbInfoStream> PdbStream;
   Optional<PdbDbiStream> DbiStream;
@@ -77,8 +77,8 @@ template <> struct MappingTraits<pdb::yaml::MsfHeaders> {
   static void mapping(IO &IO, pdb::yaml::MsfHeaders &Obj);
 };
 
-template <> struct MappingTraits<pdb::PDBFile::SuperBlock> {
-  static void mapping(IO &IO, pdb::PDBFile::SuperBlock &SB);
+template <> struct MappingTraits<pdb::msf::SuperBlock> {
+  static void mapping(IO &IO, pdb::msf::SuperBlock &SB);
 };
 
 template <> struct MappingTraits<pdb::yaml::StreamBlockList> {
@@ -95,7 +95,7 @@ template <> struct MappingTraits<pdb::yaml::PdbDbiStream> {
 }
 }
 
-LLVM_YAML_IS_SEQUENCE_VECTOR(support::ulittle32_t)
+LLVM_YAML_IS_SEQUENCE_VECTOR(uint32_t)
 LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::pdb::yaml::StreamBlockList)
 
 #endif // LLVM_TOOLS_LLVMPDBDUMP_PDBYAML_H