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