Include fixes

This patch fixes some declarations that trigger warnings when compiling with -Wstrict-prototypes