sh: Fix more user header breakage from sh64 integration.