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