fix_missing_if.h_include
gcc5-warning-fixes
