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

* 'include_refactor' of https://github.com/sitsofe/fio:
  Add include-what-you-use pragmas
  oslib: make str* compat functions more uniform
  Use POSIX path for poll.h and fcntl.h headers
  Refactor #includes and headers

diff --cc server.c
Simple merge