diff --git a/clang-tools-extra/clangd/index/Background.cpp b/clang-tools-extra/clangd/index/Background.cpp
index 69399ba8e092..a9724548e5ee 100644
--- a/clang-tools-extra/clangd/index/Background.cpp
+++ b/clang-tools-extra/clangd/index/Background.cpp
@@ -24,10 +24,10 @@
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/SHA1.h"
+#include <memory>
+#include <queue>
 #include <random>
 #include <string>
-#include <queue>
-#include <memory>
 
 using namespace llvm;
 namespace clang {
diff --git a/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp b/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp
index c79184d9220f..ee8aa67dd6db 100644
--- a/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp
+++ b/clang-tools-extra/unittests/clangd/BackgroundIndexTests.cpp
@@ -82,7 +82,7 @@ TEST(BackgroundIndexTest, ShardStorageTest) {
   class MemoryShardStorage : public ShardStorage {
     mutable std::mutex StorageMu;
     llvm::StringMap<std::string> &Storage;
-    size_t& CacheHits;
+    size_t &CacheHits;
 
   public:
     MemoryShardStorage(llvm::StringMap<std::string> &Storage, size_t &CacheHits)
@@ -103,7 +103,7 @@ TEST(BackgroundIndexTest, ShardStorageTest) {
         return llvm::make_error<llvm::StringError>(
             "Shard not found.", llvm::inconvertibleErrorCode());
       auto IndexFile = readIndexFile(Storage[ShardIdentifier]);
-      if(!IndexFile)
+      if (!IndexFile)
         return IndexFile;
       CacheHits++;
       return IndexFile;