Fix compilation error from definition reordering