More unnecessary header elimination

AutowiringBenchmarkTest also has some stray unneeded header files.