diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index 09ae5a6bccb..c8ab31813c7 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -33,6 +33,7 @@
 #include <utils/qtcassert.h>
 
 #include <QTextDocument>
+#include <QDebug>
 
 namespace ClangFormat {
 
@@ -420,9 +421,24 @@ TextEditor::Replacements ClangFormatBaseIndenter::format(
                             static_cast<unsigned int>(utf8RangeLength));
     }
 
+    clang::format::FormatStyle style = styleForFile();
+    const std::string assumedFileName = m_fileName.toString().toStdString();
+    clang::tooling::Replacements clangReplacements = clang::format::sortIncludes(style,
+                                                                                 buffer.data(),
+                                                                                 ranges,
+                                                                                 assumedFileName);
+    auto changedCode = clang::tooling::applyAllReplacements(buffer.data(), clangReplacements);
+    QTC_ASSERT(changedCode, {
+        qDebug() << QString::fromStdString(llvm::toString(changedCode.takeError()));
+        return TextEditor::Replacements();
+    });
+    ranges = clang::tooling::calculateRangesAfterReplacements(clangReplacements, ranges);
+
     clang::format::FormattingAttemptStatus status;
-    const clang::tooling::Replacements clangReplacements
-        = reformat(styleForFile(), buffer.data(), ranges, m_fileName.toString().toStdString(), &status);
+    const clang::tooling::Replacements formatReplacements
+        = reformat(style, *changedCode, ranges, m_fileName.toString().toStdString(), &status);
+    clangReplacements = clangReplacements.merge(formatReplacements);
+
     const TextEditor::Replacements toReplace = utf16Replacements(m_doc, buffer, clangReplacements);
     applyReplacements(m_doc, toReplace);
 
diff --git a/tests/unit/unittest/clangformat-test.cpp b/tests/unit/unittest/clangformat-test.cpp
index 5f0aaf1d873..5dbe291b26b 100644
--- a/tests/unit/unittest/clangformat-test.cpp
+++ b/tests/unit/unittest/clangformat-test.cpp
@@ -633,6 +633,23 @@ TEST_F(ClangFormat, FormatTemplateparameters)
 
     ASSERT_THAT(documentLines(), ElementsAre("using Alias = Template<A, B, C>"));
 }
+
+TEST_F(ClangFormat, SortIncludes)
+{
+    insertLines({"#include \"b.h\"",
+                 "#include \"a.h\"",
+                 "",
+                 "#include <bb.h>",
+                 "#include <aa.h>"});
+
+    indenter.format({{1, 5}});
+
+    ASSERT_THAT(documentLines(), ElementsAre("#include \"a.h\"",
+                                             "#include \"b.h\"",
+                                             "",
+                                             "#include <aa.h>",
+                                             "#include <bb.h>"));
+}
 // clang-format on
 
 } // namespace