make some headers public and not relying on PCH