Some include fixes