npwrapper: reorder and add missing dependencies