cater for FH naming and further polish on missing headers
cater for FH naming and further polish on missing headers

feedhenry/fh-ios-sdk,feedhenry/fh-ios-sdk,corinnekrych/fh-ios-sdk,corinnekrych/fh-ios-sdk,feedhenry/fh-ios-sdk