Include fixes

Removed comment in .cpp, fixed include in .h