Improvements to header files