staging: nvec: Add missing includes and reorder them