Remove unnecessary includes and declarations