Now that the headers themselves have ifdef protection this is no
longer necessary and more consistent with normal include handling.