refine some past NDO conversions

Don't include unneeded headers and replace a few remaining printf's.