r23512: Fix conflict in #define for SECDESC_PREFIX. Ensure all