Revert "Reorder defines"
Revert "Reorder defines"

This reverts commit 4a059914a965485cfac89145d7f5ba70612f60f0.

cppformat/cppformat,cppformat/cppformat,alabuzhev/fmt,alabuzhev/fmt,alabuzhev/fmt,cppformat/cppformat