Fixed some header files