Cleanup some headers and add install target