Always do a "Clean & Build" before commiting, not just a "Build"

Add imports missing as a result of fixing #17.