Don't export flag macros.
Merge branch 'dont-export-flag-macros' into develop