Bug 995411 - Update namespaces and includes to make everything compile happily. r=jrmuizel,botond