Step 6.5: Remove uncalled-for includes
Step 6.6: Clean up includes and forward declarations
Step 7: Only use interfaces in MockSupport.h

...and implementation in MockSupport.cpp