Step 6.1: Separate MockExpectedCall interface
Step 6.2: Rename MockExpectedFunctionCall.h MockExpectedCall.h
Step 6.2: Rename MockExpectedFunctionCall.cpp to MockExpectedCall.cpp
Step 6.3: Separate MockActualCall interface
Step 6.4: Rename MockActualFunctionCall.h to MockActualCall.h
Step 6.4: Rename MockActualFunctionCall.cpp to MockActualCall.cpp
Step 6.5: Remove uncalled-for includes
Step 6.6: Remove redundant method in MockIgnoredExpectedCall
Step 6.7: Clean up includes and forward declarations
Step 7: Only use interfaces in MockSupport.h

...and implementation in MockSupport.cpp
Apply NVI idiom where already used - 1
Apply NVI idiom where already used - 2
Apply NVI idiom where already used - 3