Add more common header files