remove extra include + remove /// weirdness in swar files