compile fix in some cases

for mixed up include order