Fixed some header file issues.