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