change includes to use brackets in headers for export