include fixes