diff --git a/bacnet-stack/include/bacenum.h b/bacnet-stack/include/bacenum.h
index 961a5d3f..97c6844b 100644
--- a/bacnet-stack/include/bacenum.h
+++ b/bacnet-stack/include/bacenum.h
@@ -1370,10 +1370,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_ERROR_CLASS = 8
+    MAX_BACNET_ERROR_CLASS = 8,
+    ERROR_CLASS_PROPRIETARY_FIRST = 64,
+    ERROR_CLASS_PROPRIETARY_LAST = 65535
 } BACNET_ERROR_CLASS;
-#define FIRST_PROPRIETARY_ERROR_CLASS 64
-#define LAST_PROPRIETARY_ERROR_CLASS 65535
 
 /* These are sorted in the order given in
    Clause 18. ERROR, REJECT AND ABORT CODES
@@ -1541,7 +1541,7 @@ typedef enum {
     ERROR_CODE_ABORT_SECURITY_ERROR = 136,
 
     MAX_BACNET_ERROR_CODE = 137,
-    
+
     ERROR_CODE_PROPRIETARY_FIRST = 256,
     ERROR_CODE_PROPRIETARY_LAST = 65535
 
@@ -1611,7 +1611,7 @@ typedef enum BACnetLightingTransition {
     BACNET_LIGHTING_TRANSITION_FADE = 1,
     BACNET_LIGHTING_TRANSITION_RAMP = 2
 } BACNET_LIGHTING_TRANSITION;
-            
+
 /* NOTE: BACNET_DAYS_OF_WEEK is different than BACNET_WEEKDAY */
 /* 0=Monday-6=Sunday */
 typedef enum BACnetDaysOfWeek {
diff --git a/bacnet-stack/src/bacerror.c b/bacnet-stack/src/bacerror.c
index ad05321c..50f45c09 100644
--- a/bacnet-stack/src/bacerror.c
+++ b/bacnet-stack/src/bacerror.c
@@ -233,8 +233,8 @@ void testBACError(
 
     /* max boundaries */
     service = 255;
-    error_class = LAST_PROPRIETARY_ERROR_CLASS;
-    error_code = LAST_PROPRIETARY_ERROR_CODE;
+    error_class = ERROR_CLASS_PROPRIETARY_LAST;
+    error_code = ERROR_CODE_PROPRIETARY_LAST;
     len =
         bacerror_encode_apdu(&apdu[0], invoke_id, service, error_class,
         error_code);