Fix warnings in header files

Fix warnings in headers files. Warnings remain in implementation files.