Move NDM:U to new macros.
Fix redefinition of SERVICE_START on windows.