CSPACE-6270: Restore 'unneeded' includes. These are actually required, perhaps because we're instantiating and not including classes in the site.pp file, and many 'includes' declarations are outside of their respective class resource blocks.