Initial includes from upstream

Signed-off-by: Valérian Saliou <valerian@valeriansaliou.name>