Install headers

For some reason we have a few commits here.
Don't merge before we sort this out. I don't have much time right now.