Added softshell and removed obsolete #includes