Improve includes in headers