Bug 828173 bustage fix for non-unified builds:  add using declaration.
Automatic merge