various fixes in headers
3 files changed