Make nbnxm headers more self-contained