fix: more porting stuff (order of includes)