diff --git a/clang-tools-extra/clangd/RIFF.h b/clang-tools-extra/clangd/RIFF.h
--- a/clang-tools-extra/clangd/RIFF.h
+++ b/clang-tools-extra/clangd/RIFF.h
@@ -30,8 +30,8 @@
 #ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_RIFF_H
 #define LLVM_CLANG_TOOLS_EXTRA_CLANGD_RIFF_H
 #include "llvm/ADT/StringRef.h"
-#include "llvm/Support/Error.h"
 #include "llvm/Support/ScopedPrinter.h"
+#include "llvm/Support/Error.h"
 #include <array>
 
 namespace clang {
diff --git a/clang-tools-extra/clangd/RIFF.cpp b/clang-tools-extra/clangd/RIFF.cpp
--- a/clang-tools-extra/clangd/RIFF.cpp
+++ b/clang-tools-extra/clangd/RIFF.cpp
@@ -18,9 +18,9 @@
 }
 
 llvm::Expected<Chunk> readChunk(llvm::StringRef &Stream) {
+  Chunk C;
   if (Stream.size() < 8)
     return makeError("incomplete chunk header");
-  Chunk C;
   std::copy(Stream.begin(), Stream.begin() + 4, C.ID.begin());
   Stream = Stream.drop_front(4);
   uint32_t Len = llvm::support::endian::read32le(Stream.take_front(4).begin());
diff --git a/clang-tools-extra/clangd/XRefs.h b/clang-tools-extra/clangd/XRefs.h
--- a/clang-tools-extra/clangd/XRefs.h
+++ b/clang-tools-extra/clangd/XRefs.h
@@ -111,4 +111,4 @@
 } // namespace clangd
 } // namespace clang
 
-#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_XREFS_H
+#endif // LLVM_CLANG_TOOLS_EXTRA_CLANGD_XREFS
diff --git a/clang-tools-extra/clangd/test/trace.test b/clang-tools-extra/clangd/test/trace.test
--- a/clang-tools-extra/clangd/test/trace.test
+++ b/clang-tools-extra/clangd/test/trace.test
@@ -10,7 +10,7 @@
 # CHECK:       "ph": "X",
 # CHECK:       "name": "BuildPreamble",
 # CHECK:       "args": {
-# CHECK:         "File": "{{.*(/|\\)}}foo.c"
+# CHECK:         "File": "{{.*(/|\\)}}bar.c"
 # CHECK:       },
 # CHECK:     }
 # CHECK:     {