[NOP] Converting more demos to new include format.