Fixes for combined NS and DDK headers