bug 1039642 - follow-up to fix non-unified build bustage (missing include and namespace) r=bustage a=metered