Reorder includes to fix building on lucid