Switch from my headers to ST's (strikingly similar) supplied ones