Remove some extraneous includes and a function, all added in bug 714260. They...

Remove some extraneous includes and a function, all added in bug 714260.  They were initially necessary when that patch was written, but they became vestigial during rebasing prior to landing, and this disuse wasn't noticed til now.  r=lumpy