Removed some includes