Rearrange the macros to avoid unnecessary breakup of namespaces
Rearrange the macros to avoid unnecessary breakup of namespaces

CaptainCrowbar/prion-lib,CaptainCrowbar/rs-core-lib,CaptainCrowbar/rs-core-lib,CaptainCrowbar/prion-lib,CaptainCrowbar/prion-lib