pre-review cleanup part 1 (until object.c, rest will follow in part 2)
pre-review cleanup part 2 (style, comment cleanup)
fix for compiler errors due to obviously missing includes