Remove redundant #includes
Change size_t to int