Stephen added the first two includes after a linux-next build failure. Did this go through a long buildbot cycle to verify it's really not needed anymore?
Umm no. I just compiled it and ran and it worked... If these are actually needed then we can safely discard this patch.
