From: Randy Hron <rwhron@earthlink.net>

Remove duplicate #includes in fs/
Remove version.h includes where they aren't necessary.
Test compiled on 2.6.0-test5-bk9.