Merge "Don't rely on transitively included headers"