Make includes consistent: Google C++ style guide, no "../", etc.
cppcheck: update include folder.