Small tweaks for cppcheck on includes