Merge branch '2023-12-21-header-inclusion-cleanup' into next

- Merge in changes to clean up various places that used <common.h> or
  <linux/kconfig.h>