Clean unittest imports

Our unit tests are doing a lot of obsolete #include's.

I used static code analysis to find #include problems, but I only chose to remove obsolete imports.  It's only a first step, but it could become even cleaner if we repeat this step.

See my attached commits for cleaner unit tests.