diff --git a/src/common/type/buffer.h b/src/common/type/buffer.h
index b3d3897d..d5556f04 100644
--- a/src/common/type/buffer.h
+++ b/src/common/type/buffer.h
@@ -95,7 +95,7 @@ By convention all buffer constant identifiers are appended with _BUF.
 
 // Used to declare buffer constants that will be externed using BUFFER_DECLARE().  Must be used in a .c file.
 #define BUFFER_STRDEF_EXTERN(name, string)                                                                                         \
-    const Buffer *const name = BUFSTRDEF(string)
+    const Buffer *name = BUFSTRDEF(string)
 
 // Used to declare buffer constants that will be local to the .c file.  Must be used in a .c file.
 #define BUFFER_STRDEF_STATIC(name, string)                                                                                         \
@@ -103,7 +103,7 @@ By convention all buffer constant identifiers are appended with _BUF.
 
 // Used to extern buffer constants declared with BUFFER_STRDEF_EXTERN(.  Must be used in a .h file.
 #define BUFFER_DECLARE(name)                                                                                                       \
-    extern const Buffer *const name
+    extern const Buffer *name
 
 /***********************************************************************************************************************************
 Constant buffers that are generally useful
diff --git a/src/common/type/string.h b/src/common/type/string.h
index d9ff1263..5322673d 100644
--- a/src/common/type/string.h
+++ b/src/common/type/string.h
@@ -105,15 +105,15 @@ By convention all string constant identifiers are appended with _STR.
 
 // Used to declare String constants that will be externed using STRING_DECLARE().  Must be used in a .c file.
 #define STRING_EXTERN(name, buffer)                                                                                                \
-    const String *const name = STRDEF(buffer)
+    const String *name = STRDEF(buffer)
 
 // Used to declare String constants that will be local to the .c file.  Must be used in a .c file.
 #define STRING_STATIC(name, buffer)                                                                                                \
-    static const String *const name = STRDEF(buffer)
+    static const String *name = STRDEF(buffer)
 
 // Used to extern String constants declared with STRING_EXTERN().  Must be used in a .h file.
 #define STRING_DECLARE(name)                                                                                                       \
-    extern const String *const name
+    extern const String *name
 
 /***********************************************************************************************************************************
 Constant strings that are generally useful
diff --git a/src/common/type/variant.c b/src/common/type/variant.c
index 0d8c71e1..94703829 100644
--- a/src/common/type/variant.c
+++ b/src/common/type/variant.c
@@ -21,7 +21,7 @@ Constant variants that are generally useful
 ***********************************************************************************************************************************/
 // Used to declare Bool Variant constants that will be externed using VARIANT_DECLARE().  Must be used in a .c file.
 #define VARIANT_BOOL_EXTERN(name, dataParam)                                                                                       \
-    const Variant *const name = ((const Variant *)&(const VariantBoolConst){.type = varTypeBool, .data = dataParam})
+    const Variant *name = ((const Variant *)&(const VariantBoolConst){.type = varTypeBool, .data = dataParam})
 
 VARIANT_BOOL_EXTERN(BOOL_FALSE_VAR,                                 false);
 VARIANT_BOOL_EXTERN(BOOL_TRUE_VAR,                                  true);
diff --git a/src/common/type/variant.h b/src/common/type/variant.h
index 47e91dbf..3059acc4 100644
--- a/src/common/type/variant.h
+++ b/src/common/type/variant.h
@@ -201,14 +201,14 @@ By convention all variant constant identifiers are appended with _VAR.
 
 // Used to declare String Variant constants that will be externed using VARIANT_DECLARE().  Must be used in a .c file.
 #define VARIANT_STRDEF_EXTERN(name, dataParam)                                                                                     \
-    const Variant *const name = VARSTRDEF(dataParam)
+    const Variant *name = VARSTRDEF(dataParam)
 
 // Used to declare String Variant constants that will be local to the .c file.  Must be used in a .c file.
 #define VARIANT_STRDEF_STATIC(name, dataParam)                                                                                     \
-    static const Variant *const name = VARSTRDEF(dataParam)
+    static const Variant *name = VARSTRDEF(dataParam)
 
 // Create a UInt Variant constant inline from an unsigned int
-#define VARUINT(dataParam)                                                                                                       \
+#define VARUINT(dataParam)                                                                                                         \
     ((const Variant *)&(const VariantUIntConst){.type = varTypeUInt, .data = dataParam})
 
 // Create a UInt64 Variant constant inline from a uint64_t
@@ -217,7 +217,7 @@ By convention all variant constant identifiers are appended with _VAR.
 
 // Used to extern String Variant constants declared with VARIANT_STRDEF_EXTERN/STATIC().  Must be used in a .h file.
 #define VARIANT_DECLARE(name)                                                                                                      \
-    extern const Variant *const name
+    extern const Variant *name
 
 /***********************************************************************************************************************************
 Constant variants that are generally useful
