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