Merge "openssh: use correct header file."