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