Bug 930458 - Add missing includes for gcc 4.5 compatibility. r=ehsan