sh: compile fixes for header cleanup.