removed clashing definition; replaced with header file
Changed type to fix warning about comparison on signed and unsigned