diff --git a/include/llvm/DebugInfo/PDB/Raw/PDBDbiStream.h b/include/llvm/DebugInfo/PDB/Raw/PDBDbiStream.h
index 7cfda03ebf2..f9d4f30353d 100644
--- a/include/llvm/DebugInfo/PDB/Raw/PDBDbiStream.h
+++ b/include/llvm/DebugInfo/PDB/Raw/PDBDbiStream.h
@@ -43,8 +43,8 @@ public:
   PDB_Machine getMachineType() const;
 
 private:
-  PDBStream Stream;
   PDBFile &Pdb;
+  PDBStream Stream;
   std::unique_ptr<HeaderInfo> Header;
 };
 }
diff --git a/lib/DebugInfo/PDB/Raw/PDBDbiStream.cpp b/lib/DebugInfo/PDB/Raw/PDBDbiStream.cpp
index 15adae666e3..389199c4a40 100644
--- a/lib/DebugInfo/PDB/Raw/PDBDbiStream.cpp
+++ b/lib/DebugInfo/PDB/Raw/PDBDbiStream.cpp
@@ -47,7 +47,7 @@ const uint16_t BuildNewFormatShift = 15;
 }
 
 struct PDBDbiStream::HeaderInfo {
-  ulittle32_t VersionSignature;
+  little32_t VersionSignature;
   ulittle32_t VersionHeader;
   ulittle32_t Age; // Should match PDBInfoStream.
   ulittle16_t GSSyms;