Merge "Add includes to fix gcc 4.7 build."