Scope fix when using a class function as a function pointer parameter.
Don't include the same includes more than once in the header.
Ensure function pointer munged name is set correctly from interfaces.