Remove a few more unneeded includes and change a loop to use ARRAY_SIZE instead of a variable.