Pull request for all the remaining patches, including the new performance monitors.

Not used in the header file? Overall looks like some of the includes are not needed here.