Same in includes folder.
cppcheck: update include folder.
normalize