diff --git a/bacnet-stack/include/bacenum.h b/bacnet-stack/include/bacenum.h
index 97c6844b..a361603e 100644
--- a/bacnet-stack/include/bacenum.h
+++ b/bacnet-stack/include/bacenum.h
@@ -1211,9 +1211,9 @@ typedef enum {
     SERVICE_SUPPORTED_UTC_TIME_SYNCHRONIZATION = 36,
     SERVICE_SUPPORTED_WHO_HAS = 33,
     SERVICE_SUPPORTED_WHO_IS = 34
-        /* Other services to be added as they are defined. */
-        /* All values in this production are reserved */
-        /* for definition by ASHRAE. */
+    /* Other services to be added as they are defined. */
+    /* All values in this production are reserved */
+    /* for definition by ASHRAE. */
 } BACNET_SERVICES_SUPPORTED;
 
 typedef enum {
@@ -1334,10 +1334,10 @@ typedef enum {
     /* Enumerated values 0-63 are reserved for definition by ASHRAE. */
     /* Enumerated values 64-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */
-    MAX_BACNET_ABORT_REASON = 5
+    MAX_BACNET_ABORT_REASON = 5,
+    ABORT_REASON_PROPRIETARY_FIRST = 64,
+    ABORT_REASON_PROPRIETARY_LAST = 65535
 } BACNET_ABORT_REASON;
-#define FIRST_PROPRIETARY_ABORT_REASON 64
-#define LAST_PROPRIETARY_ABORT_REASON 65535
 
 typedef enum {
     REJECT_REASON_OTHER = 0,
@@ -1353,10 +1353,10 @@ typedef enum {
     /* Enumerated values 0-63 are reserved for definition by ASHRAE. */
     /* Enumerated values 64-65535 may be used by others subject to */
     /* the procedures and constraints described in Clause 23. */
-    MAX_BACNET_REJECT_REASON = 10
+    MAX_BACNET_REJECT_REASON = 10,
+    REJECT_REASON_PROPRIETARY_FIRST = 64,
+    REJECT_REASON_PROPRIETARY_LAST = 65535
 } BACNET_REJECT_REASON;
-#define FIRST_PROPRIETARY_REJECT_REASON 64
-#define LAST_PROPRIETARY_REJECT_REASON 65535
 
 typedef enum {
     ERROR_CLASS_DEVICE = 0,
diff --git a/bacnet-stack/src/abort.c b/bacnet-stack/src/abort.c
index 0167e07f..2774f006 100644
--- a/bacnet-stack/src/abort.c
+++ b/bacnet-stack/src/abort.c
@@ -63,7 +63,7 @@ BACNET_ABORT_REASON abort_convert_error_code(
             abort_code = ABORT_REASON_SEGMENTATION_NOT_SUPPORTED;
             break;
         case ERROR_CODE_ABORT_PROPRIETARY:
-            abort_code = (BACNET_ABORT_REASON) FIRST_PROPRIETARY_ABORT_REASON;
+            abort_code = ABORT_REASON_PROPRIETARY_FIRST;
             break;
         case ERROR_CODE_ABORT_OTHER:
         default:
diff --git a/bacnet-stack/src/bactext.c b/bacnet-stack/src/bactext.c
index 7d05fbdf..cf545760 100644
--- a/bacnet-stack/src/bactext.c
+++ b/bacnet-stack/src/bactext.c
@@ -1483,6 +1483,8 @@ INDTEXT_DATA bacnet_reject_reason_names[] = {
     ,
     {REJECT_REASON_UNRECOGNIZED_SERVICE, "Unrecognized Service"}
     ,
+    {REJECT_REASON_PROPRIETARY_FIRST, "Proprietary"}
+    ,
     {0, NULL}
 };
 
@@ -1490,7 +1492,7 @@ const char *bactext_reject_reason_name(
     unsigned index)
 {
     return indtext_by_index_split_default(bacnet_reject_reason_names, index,
-        FIRST_PROPRIETARY_REJECT_REASON, ASHRAE_Reserved_String,
+        REJECT_REASON_PROPRIETARY_FIRST, ASHRAE_Reserved_String,
         Vendor_Proprietary_String);
 }
 
@@ -1506,6 +1508,8 @@ INDTEXT_DATA bacnet_abort_reason_names[] = {
     ,
     {ABORT_REASON_SEGMENTATION_NOT_SUPPORTED, "Segmentation Not Supported"}
     ,
+    {ABORT_REASON_PROPRIETARY_FIRST, "Proprietary"}
+    ,
     {0, NULL}
 };
 
@@ -1513,7 +1517,7 @@ const char *bactext_abort_reason_name(
     unsigned index)
 {
     return indtext_by_index_split_default(bacnet_abort_reason_names, index,
-        FIRST_PROPRIETARY_ABORT_REASON, ASHRAE_Reserved_String,
+        ABORT_REASON_PROPRIETARY_FIRST, ASHRAE_Reserved_String,
         Vendor_Proprietary_String);
 }
 
diff --git a/bacnet-stack/src/reject.c b/bacnet-stack/src/reject.c
index b3a7d05b..a2a55239 100644
--- a/bacnet-stack/src/reject.c
+++ b/bacnet-stack/src/reject.c
@@ -80,8 +80,7 @@ BACNET_REJECT_REASON reject_convert_error_code(
             reject_code = REJECT_REASON_UNRECOGNIZED_SERVICE;
             break;
         case ERROR_CODE_REJECT_PROPRIETARY:
-            reject_code =
-                (BACNET_REJECT_REASON) FIRST_PROPRIETARY_REJECT_REASON;
+            reject_code = REJECT_REASON_PROPRIETARY_FIRST;
             break;
         case ERROR_CODE_REJECT_OTHER:
         default: