Add includes that were indirectly included before.