Updated build, and added missing headers to NEXT combined files.