Remove unnecessary includes from headers
Add modulo operator