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