minor fixes and macro removals

cleans up includes

(0) -30 -10 -2 +2 +10 +30 tip

mercurial