Clean up includes.
cpp check caught those.
Stop cpp-checking thirdParty.
Remove a comment, and add the assertion file.
Didn't mean to add that.