fix includes

@eleith @jnwng PTAL