sync with diff; missing include; reorder cubes