Revert "Add missing includes"

This reverts commit 4ca2397dbff49093edc6ed6c0f2e0ebfe0ca3423.