Added some headers to fix build on some gcc versions
3 files changed