Fix #include case issues