* cleanup for -Wall: unused variables removed, some return types fixed, includes...