diff --git a/cmake/QtCreatorAPI.cmake b/cmake/QtCreatorAPI.cmake
index 6d0ebdd715a..a790483e91e 100644
--- a/cmake/QtCreatorAPI.cmake
+++ b/cmake/QtCreatorAPI.cmake
@@ -275,7 +275,7 @@ endfunction(add_qtc_library)
 
 function(add_qtc_plugin target_name)
   cmake_parse_arguments(_arg
-    "EXPERIMENTAL;SKIP_DEBUG_CMAKE_FILE_CHECK;SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION;EXPORT"
+    "SKIP_DEBUG_CMAKE_FILE_CHECK;SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION;EXPORT"
     "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT"
     "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS;PROPERTIES"
     ${ARGN}
@@ -352,10 +352,7 @@ function(add_qtc_plugin target_name)
       "        { \"Name\" : \"${i}\", \"Version\" : \"${_v}\" }"
     )
   endforeach(i)
-  string(REPLACE "}        {" "},\n        {"
-    _arg_DEPENDENCY_STRING "${_arg_DEPENDENCY_STRING}"
-  )
-  foreach(i IN LISTS ${_arg_RECOMMENDS})
+  foreach(i IN LISTS _arg_PLUGIN_RECOMMENDS)
     if (i MATCHES "^QtCreator::")
       set(_v ${IDE_VERSION})
       string(REPLACE "QtCreator::" "" i ${i})
@@ -366,10 +363,11 @@ function(add_qtc_plugin target_name)
       "        { \"Name\" : \"${i}\", \"Version\" : \"${_v}\", \"Type\" : \"optional\" }"
     )
   endforeach(i)
+
+  string(REPLACE "}        {" "},\n        {"
+    _arg_DEPENDENCY_STRING "${_arg_DEPENDENCY_STRING}"
+  )
   string(APPEND _arg_DEPENDENCY_STRING "\n    ]")
-  if (_arg_EXPERIMENTAL)
-    string(APPEND _arg_DEPENDENCY_STRING ",\n    \"Experimental\" : true")
-  endif()
 
   set(IDE_PLUGIN_DEPENDENCY_STRING ${_arg_DEPENDENCY_STRING})
 
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index 86fd7096f2c..871f999b43e 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -26,7 +26,6 @@ add_subdirectory(help)
 add_subdirectory(resourceeditor)
 add_subdirectory(tasklist)
 add_subdirectory(nim)
-add_subdirectory(incredibuild)
 add_subdirectory(conan)
 
 # Level 4: (only depends on Level 3 and below)
@@ -45,9 +44,7 @@ add_subdirectory(beautifier)
 add_subdirectory(clangformat)
 add_subdirectory(clangrefactoring)
 add_subdirectory(clearcase)
-add_subdirectory(cmakeprojectmanager)
 add_subdirectory(cvs)
-add_subdirectory(debugger)
 add_subdirectory(designer)
 add_subdirectory(fakevim)
 add_subdirectory(genericprojectmanager)
@@ -65,6 +62,10 @@ add_subdirectory(languageclient)
 add_subdirectory(studiowelcome)
 
 # Level 6:
+add_subdirectory(cmakeprojectmanager)
+add_subdirectory(debugger)
+
+# Level 7:
 add_subdirectory(android)
 add_subdirectory(autotest)
 add_subdirectory(autotoolsprojectmanager)
@@ -72,6 +73,7 @@ add_subdirectory(baremetal)
 add_subdirectory(clangcodemodel)
 add_subdirectory(clangtools)
 add_subdirectory(cppcheck)
+add_subdirectory(incredibuild)
 add_subdirectory(ios)
 add_subdirectory(python)
 add_subdirectory(qmljseditor)
@@ -84,7 +86,7 @@ add_subdirectory(perfprofiler)
 add_subdirectory(qbsprojectmanager)
 add_subdirectory(ctfvisualizer)
 
-# Level 7:
+# Level 8:
 add_subdirectory(boot2qt)
 unset(qmldesigner_builddir)
 if (WIN32 AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
diff --git a/src/plugins/incredibuild/CMakeLists.txt b/src/plugins/incredibuild/CMakeLists.txt
index ab8f43e7208..96da8c52304 100644
--- a/src/plugins/incredibuild/CMakeLists.txt
+++ b/src/plugins/incredibuild/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_qtc_plugin(IncrediBuild
   PLUGIN_DEPENDS Core ProjectExplorer
-  PLUGIN_RECOMMENDS QmakeProjectManager CmakeProjectManager
+  PLUGIN_RECOMMENDS QmakeProjectManager CMakeProjectManager
   SOURCES
   buildconsolebuildstep.cpp
   buildconsolebuildstep.h