Correct src & build files for previous pull-request