Commited header file changes too for previous patch.