While here trim headers and convert some USE_GNOME=pkgconfig to USE_PKGCONFIG=build Approved by: maintainer (dhn)