rearrange definitions to make clang clang happy