diff --git a/include/crm/pengine/common.h b/include/crm/pengine/common.h
index 939f01fcb7..7ee7960318 100644
--- a/include/crm/pengine/common.h
+++ b/include/crm/pengine/common.h
@@ -1,188 +1,191 @@
 /*
  * Copyright 2004-2021 the Pacemaker project contributors
  *
  * The version control history for this file may have further details.
  *
  * This source code is licensed under the GNU Lesser General Public License
  * version 2.1 or later (LGPLv2.1+) WITHOUT ANY WARRANTY.
  */
 
 #ifndef PE_COMMON__H
 #  define PE_COMMON__H
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #  include <glib.h>
 #  include <regex.h>
 
 #  include <crm/common/iso8601.h>
 
 extern gboolean was_processing_error;
 extern gboolean was_processing_warning;
 
 /* The order is (partially) significant here; the values from action_fail_ignore
  * through action_fail_fence are in order of increasing severity.
  *
  * @COMPAT The values should be ordered and numbered per the "TODO" comments
  *         below, so all values are in order of severity and there is room for
  *         future additions, but that would break API compatibility.
  * @TODO   For now, we just use a function to compare the values specially, but
  *         at the next compatibility break, we should arrange things properly.
  */
 enum action_fail_response {
     action_fail_ignore,     // @TODO = 10
     // @TODO action_fail_demote = 20,
     action_fail_recover,    // @TODO = 30
     // @TODO action_fail_reset_remote = 40,
     // @TODO action_fail_restart_container = 50,
     action_fail_migrate,    // @TODO = 60
     action_fail_block,      // @TODO = 70
     action_fail_stop,       // @TODO = 80
     action_fail_standby,    // @TODO = 90
     action_fail_fence,      // @TODO = 100
 
     // @COMPAT Values below here are out of order for API compatibility
 
     action_fail_restart_container,
 
     /* This is reserved for internal use for remote node connection resources.
      * Fence the remote node if stonith is enabled, otherwise attempt to recover
      * the connection resource. This allows us to specify types of connection
      * resource failures that should result in fencing the remote node
      * (for example, recurring monitor failures).
      */
     action_fail_reset_remote,
 
     action_fail_demote,
 };
 
 /* the "done" action must be the "pre" action +1 */
 enum action_tasks {
     no_action,
     monitor_rsc,
     stop_rsc,
     stopped_rsc,
     start_rsc,
     started_rsc,
     action_notify,
     action_notified,
     action_promote,
     action_promoted,
     action_demote,
     action_demoted,
     shutdown_crm,
     stonith_node
 };
 
 enum rsc_recovery_type {
     recovery_stop_start,
     recovery_stop_only,
     recovery_block
 };
 
 enum rsc_start_requirement {
     rsc_req_nothing,            /* Allowed by custom_action() */
     rsc_req_quorum,             /* Enforced by custom_action() */
     rsc_req_stonith             /* Enforced by native_start_constraints() */
 };
 
 //! Possible roles that a resource can be in
 enum rsc_role_e {
     RSC_ROLE_UNKNOWN    = 0,
     RSC_ROLE_STOPPED    = 1,
     RSC_ROLE_STARTED    = 2,
     RSC_ROLE_SLAVE      = 3,
     RSC_ROLE_PROMOTED   = 4,
 
+#if !defined(PCMK_ALLOW_DEPRECATED) || (PCMK_ALLOW_DEPRECATED == 1)
+    //! \deprecated Use RSC_ROLE_PROMOTED instead
     RSC_ROLE_MASTER     = RSC_ROLE_PROMOTED,
+#endif
 };
 
 #  define RSC_ROLE_MAX  (RSC_ROLE_PROMOTED + 1)
 
 #  define RSC_ROLE_UNKNOWN_S "Unknown"
 #  define RSC_ROLE_STOPPED_S "Stopped"
 #  define RSC_ROLE_STARTED_S "Started"
 #  define RSC_ROLE_SLAVE_S   "Slave"
 #  define RSC_ROLE_MASTER_S  "Master"
 
 enum pe_print_options {
     pe_print_log            = (1 << 0),  //! \deprecated
     pe_print_html           = (1 << 1),  //! \deprecated
     pe_print_ncurses        = (1 << 2),  //! \deprecated
     pe_print_printf         = (1 << 3),  //! \deprecated
     pe_print_dev            = (1 << 4),  //! \deprecated Ignored
     pe_print_details        = (1 << 5),  //! \deprecated Ignored
     pe_print_max_details    = (1 << 6),  //! \deprecated Ignored
     pe_print_rsconly        = (1 << 7),
     pe_print_ops            = (1 << 8),
     pe_print_suppres_nl     = (1 << 9),
     pe_print_xml            = (1 << 10), //! \deprecated
     pe_print_brief          = (1 << 11),
     pe_print_pending        = (1 << 12),
     pe_print_clone_details  = (1 << 13),
     pe_print_clone_active   = (1 << 14), // Print clone instances only if active
     pe_print_implicit       = (1 << 15)  // Print implicitly created resources
 };
 
 const char *task2text(enum action_tasks task);
 enum action_tasks text2task(const char *task);
 enum rsc_role_e text2role(const char *role);
 const char *role2text(enum rsc_role_e role);
 const char *fail2text(enum action_fail_response fail);
 
 const char *pe_pref(GHashTable * options, const char *name);
 void calculate_active_ops(GList * sorted_op_list, int *start_index, int *stop_index);
 
 static inline const char *
 recovery2text(enum rsc_recovery_type type)
 {
     switch (type) {
         case recovery_stop_only:
             return "shutting it down";
         case recovery_stop_start:
             return "attempting recovery";
         case recovery_block:
             return "waiting for an administrator";
     }
     return "Unknown";
 }
 
 typedef struct pe_re_match_data {
     char *string;
     int nregs;
     regmatch_t *pmatch;
 } pe_re_match_data_t;
 
 typedef struct pe_match_data {
     pe_re_match_data_t *re;
     GHashTable *params;
     GHashTable *meta;
 } pe_match_data_t;
 
 typedef struct pe_rsc_eval_data {
     const char *standard;
     const char *provider;
     const char *agent;
 } pe_rsc_eval_data_t;
 
 typedef struct pe_op_eval_data {
     const char *op_name;
     guint interval;
 } pe_op_eval_data_t;
 
 typedef struct pe_rule_eval_data {
     GHashTable *node_hash;
     enum rsc_role_e role;
     crm_time_t *now;
     pe_match_data_t *match_data;
     pe_rsc_eval_data_t *rsc_data;
     pe_op_eval_data_t *op_data;
 } pe_rule_eval_data_t;
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif