autotools: put -I into CPPFLAGS
Remove redundant lines from png