Add missing header and test cases for r173939.