Fixing compile order issues.