diff --git a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
index c2d2fe9e2dd..f2d8d254249 100644
--- a/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
+++ b/doc/qtcreator/src/projects/creator-only/creator-projects-custom-wizards-json.qdocinc
@@ -238,7 +238,7 @@
                     { "key": "CN", "value": "%{JS: Cpp.className(value('Class'))}" },
                     { "key": "Base", "value": "%{JS: value('BaseCB') === '' ? value('BaseEdit') : value('BaseCB')}" },
                     { "key": "isQObject", "value": "%{JS: (value('Base') === 'QObject' || value('Base') === 'QWidget' || value('Base') === 'QMainWindow' || value('Base') === 'QQuickItem' ) ? 'true' : 'false'}" },
-                    { "key": "GUARD", "value": "%{JS: Cpp.classToHeaderGuard(value('Class'), Util.suffix(value('HdrFileName'))}" },
+                    { "key": "GUARD", "value": "%{JS: Cpp.headerGuard(value('HdrFileName'))}" },
                     { "key": "SharedDataInit", "value": "%{JS: value('IncludeQSharedData') ? 'data(new %{CN}Data)' : '' }" }
                 ],
                 \endcode
diff --git a/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json b/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json
index 0164a9f3d57..d12edc4576d 100644
--- a/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquick2-extension/wizard.json
@@ -23,8 +23,8 @@
         { "key": "ObjectHdr", "value": "%{JS: Cpp.classToFileName(value('ObjectName'), Util.preferredSuffix('text/x-c++hdr'))}" },
         { "key": "ObjectQml", "value": "%{JS: Util.fileName(value('ObjectName') + 'Controls', 'qml')}" },
         { "key": "PluginName", "value": "%{JS: value('ProjectName').charAt(0).toUpperCase() + value('ProjectName').slice(1) + 'Plugin' }" },
-        { "key": "PLUGINGUARD", "value": "%{JS: Cpp.classToHeaderGuard(value('PluginBaseFileName'), Util.preferredSuffix('text/x-c++hdr'))}" },
-        { "key": "OBJECTGUARD", "value": "%{JS: Cpp.classToHeaderGuard(value('ObjectName'), Util.preferredSuffix('text/x-c++hdr'))}" },
+        { "key": "PLUGINGUARD", "value": "%{JS: Cpp.headerGuard(value('PluginHdr'))}" },
+        { "key": "OBJECTGUARD", "value": "%{JS: Cpp.headerGuard(value('ObjectHdr'))}" },
         { "key": "IsQt6", "value": "%{JS: value('QtVersion').IsQt6}" },
         { "key": "QtQuickVersion", "value": "%{JS: value('QtVersion').QtQuickVersion}" },
         { "key": "QtQuickFeature", "value": "%{JS: (value('QtQuickVersion')=='') ? 'QtSupport.Wizards.FeatureQt.6.2' : 'QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}'}" },
diff --git a/src/plugins/cppeditor/cpptoolsjsextension.cpp b/src/plugins/cppeditor/cpptoolsjsextension.cpp
index 607744eec1b..c03a38ede2b 100644
--- a/src/plugins/cppeditor/cpptoolsjsextension.cpp
+++ b/src/plugins/cppeditor/cpptoolsjsextension.cpp
@@ -98,11 +98,6 @@ QString CppToolsJsExtension::classToFileName(const QString &klass, const QString
     return finalPath + name + ext;
 }
 
-QString CppToolsJsExtension::classToHeaderGuard(const QString &klass, const QString &extension) const
-{
-    return Utils::headerGuard(fileName(className(klass), extension), namespaces(klass));
-}
-
 QString CppToolsJsExtension::openNamespaces(const QString &klass) const
 {
     QString result;
diff --git a/src/plugins/cppeditor/cpptoolsjsextension.h b/src/plugins/cppeditor/cpptoolsjsextension.h
index 593f9536411..3b74ebde703 100644
--- a/src/plugins/cppeditor/cpptoolsjsextension.h
+++ b/src/plugins/cppeditor/cpptoolsjsextension.h
@@ -39,7 +39,6 @@ public:
     // Fix the filename casing as configured in C++/File Naming:
     Q_INVOKABLE QString classToFileName(const QString &klass,
                                         const QString &extension) const;
-    Q_INVOKABLE QString classToHeaderGuard(const QString &klass, const QString &extension) const;
     Q_INVOKABLE QString openNamespaces(const QString &klass) const;
     Q_INVOKABLE QString closeNamespaces(const QString &klass) const;
     Q_INVOKABLE bool hasQObjectParent(const QString &klassName) const;
diff --git a/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp
index e8a6c9b33fe..4b83faaf2d4 100644
--- a/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp
+++ b/src/plugins/cppeditor/quickfixes/moveclasstoownfile.cpp
@@ -388,7 +388,7 @@ private:
             = Utils::transform<QStringList>(state->namespacePath, [&](const Namespace *ns) {
                   return ov.prettyName(ns->name());
               });
-        const QString headerGuard = Utils::headerGuard(headerFileName, namespaceNames);
+        const QString headerGuard = Utils::headerGuard(headerFileName);
         if (fileSettings.headerPragmaOnce) {
             headerContent.append("#pragma once\n");
         } else {
diff --git a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
index 677494658b4..e0afdc45d97 100644
--- a/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
+++ b/src/plugins/designer/qtdesignerformclasscodegenerator.cpp
@@ -75,7 +75,7 @@ bool QtDesignerFormClassCodeGenerator::generateCpp(const FormClassWizardParamete
     const QString sourceLicense = CppEditor::AbstractEditorSupport::licenseTemplate(
         project, FilePath::fromString(parameters.sourceFile), parameters.className);
     // Include guards
-    const QString guard = Utils::headerGuard(parameters.headerFile, namespaceList);
+    const QString guard = Utils::headerGuard(parameters.headerFile);
 
     const QString uiInclude = "ui_" + QFileInfo(parameters.uiFile).completeBaseName() + ".h";