Convert to new options framework,
While here trim headers and fix pkgconfig dependency

Approved by: decke (maintainer)