Fixed headers so they work with other projects