Fixed compilation with -Wstrict-prototypes
Merge pull request #973 from hardening/includeFixesTrunk

Fixed compilation with -Wstrict-prototypes