Set of changes to ensure a "make" at the top-level succeeds

We're trying to get everything to build in buildbot and keep it all building. Currently a 'make' in the top of the repository fails with the 12.2 tools. This at least makes it build.