diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index b580c4c54d9..ee0a0baaca0 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -162,6 +162,8 @@ QtcPlugin {
         "actionmanager/command.cpp",
         "actionmanager/command.h",
         "actionmanager/command_p.h",
+        "actionmanager/commandbutton.h",
+        "actionmanager/commandbutton.cpp",
         "actionmanager/commandmappings.cpp",
         "actionmanager/commandmappings.h",
         "actionmanager/commandmappings.ui",
diff --git a/src/plugins/imageviewer/imageviewer.qbs b/src/plugins/imageviewer/imageviewer.qbs
index 22d096fcfe8..d2257621cc9 100644
--- a/src/plugins/imageviewer/imageviewer.qbs
+++ b/src/plugins/imageviewer/imageviewer.qbs
@@ -17,7 +17,6 @@ QtcPlugin {
     ]
 
     files: [
-        "commandbutton.h",
         "imageviewerplugin.h",
         "imageviewerfactory.h",
         "imageviewerfile.h",
@@ -25,7 +24,6 @@ QtcPlugin {
         "imageview.h",
         "imageviewerconstants.h",
         "imagevieweractionhandler.h",
-        "commandbutton.cpp",
         "imageviewerplugin.cpp",
         "imageviewerfactory.cpp",
         "imageviewerfile.cpp",