Minor changes to some header files