[PATCH 20/81] core: Remove <common.h> and add needed includes