More cleanups of header files

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>