Remove some header dependencies from StonePusher
Remove some header dependencies from TableIterator