diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h
index 2e8e944c5bf..14c54db7609 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.h
+++ b/src/plugins/clangformat/clangformatbaseindenter.h
@@ -66,7 +66,7 @@ public:
 
     bool isElectricCharacter(const QChar &ch) const override;
 
-    std::optional<int> margin() const override;
+    Utils::optional<int> margin() const override;
 
 protected:
     virtual clang::format::FormatStyle styleForFile() const;
diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h
index 407778b7172..1d64dce5e11 100644
--- a/src/plugins/texteditor/indenter.h
+++ b/src/plugins/texteditor/indenter.h
@@ -120,7 +120,7 @@ public:
                           int cursorPositionInEditor = -1)
         = 0;
 
-    virtual std::optional<int> margin() const { return std::nullopt; }
+    virtual Utils::optional<int> margin() const { return std::nullopt; }
 
 protected:
     QTextDocument *m_doc;