more include fixes