Fix some configure header prereqs