Revert "got rid of unneeded includes"

This reverts commit 3ae0224672a143e37b148cca1e3453343dcfdc48.