Included c-headers for better 2.4 compatibility
Merge pull request #3513 from mshabunin:compat-30