navutil replaced, Units introduced. Cleanup of header file inclusion.