Better way to handle headers and libraries