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