More changes for the benefit of kbuild.

8 files changed