Bug 976260 - Fix tbpl red because of include issues on CLOSED TREE. r=tbpl-red