Remove unused includes and custom SZ define.
Merge branch 'master' of github.com:johnou/debian_squeeze_stora_kernel