change order of includes to fix compile error