more include fixes in complex multiplies + re-indent