More #define and #include fixes