More #include fixes