IncludeFixer - fix for #439