[PATCH 13/18] part: Remove <common.h> and add needed includes