Fix double-include in last merge