Change order of includes to prevent errors
Merge branch 'master' into librocket