Correct include paths and scatter file location