Fix export of headers