Fix include order + Typo