[JK2SP] Remove unused header.
[JK2SP] More header cleanup.
Merge branch 'master' into rend2