bug 310217: clean up the build
7 files changed