eliminate some unnecessary includes, move some to .cpp instead of .h
small code maintenance and commenting