merge ntdef.h formatting changes