Remove unneeded include files.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14258 a5019735-40e9-0310-863c-91ae7b9d1cf9
Remove unused and possibly incorrectly defined macro.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14259 a5019735-40e9-0310-863c-91ae7b9d1cf9
Give static variable function scope.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14260 a5019735-40e9-0310-863c-91ae7b9d1cf9