Merge branch 'include_refactor' of https://github.com/sitsofe/fio