Revert "Add of missing headers"

This reverts commit 91413f1836af3281e29876be23c033b6d4bfefba.