small include fixes