Change order of includes to prevent errors