Fix #include order