Step 6.5: Remove uncalled-for includes
Use of interfaces in MockSupport.h

...and implementation in MockSupport.cpp