Move bswap macros to a better location