Fixing include issues with extractors