d2: fix inline building for d2vzw and add a2220 header include
Merge remote-tracking branch 'invisiblek/jb_2.5-207' into jb_2.5-207