Removing unnecessary include headers