Merge pull request #268 from arstrube/issue214_6.4

Issue214 6.4
Step 6.5: Remove uncalled-for includes
Step 6.6: Remove redundant method in MockIgnoredExpectedCall
Step 6.7: Clean up includes and forward declarations