Very new versions of gcc appear to have now cleaned up yet another header leaking out