Modules: Restore unnecessary inclusions for compatibility
Since !8311 (merged) some existing projects broke because they were accidentally relying on indirect inclusion of some check modules. For now, restore the unnecessary includes for compatibility. They can be removed with a policy later.
Fixes: #24991 (closed)
Issue: #24994
Backport: release