Use better include path order