Add support for includes