cleanup for v3.9 round2 - remove unneeded #includes for mach-dove - remove unneeded #includes and code for the nsa310