Resolve #3625109 "Consolidate core .inc"

nicxvanrequested to merge
issue/drupal-3625109:3625109-consolidate-core-.inc into main

Closes #3625109

Merge request reports