First do a commit that is nothing but the rename. That won't affect any configuration. Then do a commit adding the missing #include (and test it by locally removing the bsd file and doing a Hurd build). Finally, do a commit removing the bsd file.
Thanks, Roland
