Minor: Remove superfluous includes