Re-arrange order of includes