diff --git a/fsw/tables/sc_ats1.c b/fsw/tables/sc_ats1.c
index 9e796d0..05050ba 100644
--- a/fsw/tables/sc_ats1.c
+++ b/fsw/tables/sc_ats1.c
@@ -94,7 +94,7 @@ typedef union
 } SC_AtsTable1_t;
 
 /* Helper macro to get size of structure elements */
-#define SC_MEMBER_SIZE(member) (sizeof(((SC_AtsStruct1_t *)0)->member))
+#define SC_MEMBER_SIZE(member) (sizeof(((SC_AtsStruct1_t *)NULL)->member))
 
 /* Used designated intializers to be verbose, modify as needed/desired */
 SC_AtsTable1_t SC_Ats1 = {
diff --git a/fsw/tables/sc_rts001.c b/fsw/tables/sc_rts001.c
index 3ef44c7..30da7ab 100644
--- a/fsw/tables/sc_rts001.c
+++ b/fsw/tables/sc_rts001.c
@@ -72,7 +72,7 @@ typedef union
 } SC_RtsTable001_t;
 
 /* Helper macro to get size of structure elements */
-#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct001_t *)0)->member))
+#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct001_t *)NULL)->member))
 
 /* Used designated initializers to be verbose, modify as needed/desired */
 SC_RtsTable001_t SC_Rts001 = {
diff --git a/fsw/tables/sc_rts002.c b/fsw/tables/sc_rts002.c
index 7610d7d..58f7d0f 100644
--- a/fsw/tables/sc_rts002.c
+++ b/fsw/tables/sc_rts002.c
@@ -66,7 +66,7 @@ typedef union
 } SC_RtsTable002_t;
 
 /* Helper macro to get size of structure elements */
-#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct002_t *)0)->member))
+#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct002_t *)NULL)->member))
 
 /* Used designated initializers to be verbose, modify as needed/desired */
 SC_RtsTable002_t SC_Rts002 = {
diff --git a/fsw/tables/sc_rts003.c b/fsw/tables/sc_rts003.c
index 5f59f3e..2c3859a 100644
--- a/fsw/tables/sc_rts003.c
+++ b/fsw/tables/sc_rts003.c
@@ -66,7 +66,7 @@ typedef union
 } SC_RtsTable003_t;
 
 /* Helper macro to get size of structure elements */
-#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct003_t *)0)->member))
+#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct003_t *)NULL)->member))
 
 /* Used designated initializers to be verbose, modify as needed/desired */
 SC_RtsTable003_t SC_Rts003 = {
diff --git a/fsw/tables/sc_rts004.c b/fsw/tables/sc_rts004.c
index de94223..ac2fedd 100644
--- a/fsw/tables/sc_rts004.c
+++ b/fsw/tables/sc_rts004.c
@@ -66,7 +66,7 @@ typedef union
 } SC_RtsTable004_t;
 
 /* Helper macro to get size of structure elements */
-#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct004_t *)0)->member))
+#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct004_t *)NULL)->member))
 
 /* Used designated initializers to be verbose, modify as needed/desired */
 SC_RtsTable004_t SC_Rts004 = {