Nothing from these headers are used within this source file, so we can remove them.
This commit instends on better naming the new purpose of this classes.