Removing various instances of unnecessary includes, reducing the maze of
header dependencies.

Link: http://lkml.kernel.org/n/tip-hwu6eyuok9pc57alookyzmsf@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>