diff --git a/src/bacnet/basic/object/ai.c b/src/bacnet/basic/object/ai.c
index 5b444bf1..54d0650b 100644
--- a/src/bacnet/basic/object/ai.c
+++ b/src/bacnet/basic/object/ai.c
@@ -45,7 +45,7 @@
 #define MAX_ANALOG_INPUTS 4
 #endif
 
-ANALOG_INPUT_DESCR AI_Descr[MAX_ANALOG_INPUTS];
+static ANALOG_INPUT_DESCR AI_Descr[MAX_ANALOG_INPUTS];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
diff --git a/src/bacnet/basic/object/av.c b/src/bacnet/basic/object/av.c
index fc1fbd19..ed8a40a7 100644
--- a/src/bacnet/basic/object/av.c
+++ b/src/bacnet/basic/object/av.c
@@ -45,7 +45,7 @@
 #define MAX_ANALOG_VALUES 4
 #endif
 
-ANALOG_VALUE_DESCR AV_Descr[MAX_ANALOG_VALUES];
+static ANALOG_VALUE_DESCR AV_Descr[MAX_ANALOG_VALUES];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int Analog_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
diff --git a/src/bacnet/basic/object/channel.c b/src/bacnet/basic/object/channel.c
index de7f5dd4..816f6655 100644
--- a/src/bacnet/basic/object/channel.c
+++ b/src/bacnet/basic/object/channel.c
@@ -73,7 +73,7 @@ struct bacnet_channel_object {
     uint32_t Control_Groups[CONTROL_GROUPS_MAX];
 };
 
-struct bacnet_channel_object Channel[BACNET_CHANNELS_MAX];
+static struct bacnet_channel_object Channel[BACNET_CHANNELS_MAX];
 
 /* These arrays are used by the ReadPropertyMultiple handler
    property-list property (as of protocol-revision 14) */
diff --git a/src/bacnet/basic/object/iv.c b/src/bacnet/basic/object/iv.c
index 416f9577..386854d6 100644
--- a/src/bacnet/basic/object/iv.c
+++ b/src/bacnet/basic/object/iv.c
@@ -56,7 +56,7 @@ struct integer_object {
     int32_t Present_Value;
     uint16_t Units;
 };
-struct integer_object Integer_Value[MAX_INTEGER_VALUES];
+static struct integer_object Integer_Value[MAX_INTEGER_VALUES];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int Integer_Value_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
diff --git a/src/bacnet/basic/object/lo.c b/src/bacnet/basic/object/lo.c
index 7caca213..c29e9082 100644
--- a/src/bacnet/basic/object/lo.c
+++ b/src/bacnet/basic/object/lo.c
@@ -71,7 +71,7 @@ struct lighting_output_object {
     float Max_Actual_Value;
     uint8_t Lighting_Command_Default_Priority;
 };
-struct lighting_output_object Lighting_Output[MAX_LIGHTING_OUTPUTS];
+static struct lighting_output_object Lighting_Output[MAX_LIGHTING_OUTPUTS];
 
 /* These arrays are used by the ReadPropertyMultiple handler and
    property-list property (as of protocol-revision 14) */
diff --git a/src/bacnet/basic/object/netport.c b/src/bacnet/basic/object/netport.c
index 7a1b17f9..e5759874 100644
--- a/src/bacnet/basic/object/netport.c
+++ b/src/bacnet/basic/object/netport.c
@@ -110,7 +110,7 @@ struct object_data {
 #ifndef BACNET_NETWORK_PORTS_MAX
 #define BACNET_NETWORK_PORTS_MAX 1
 #endif
-struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
+static struct object_data Object_List[BACNET_NETWORK_PORTS_MAX];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int Network_Port_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
diff --git a/src/bacnet/basic/object/osv.c b/src/bacnet/basic/object/osv.c
index f0f74c12..da3f2c07 100644
--- a/src/bacnet/basic/object/osv.c
+++ b/src/bacnet/basic/object/osv.c
@@ -44,7 +44,7 @@
 #define MAX_OCTETSTRING_VALUES 4
 #endif
 
-OCTETSTRING_VALUE_DESCR OSV_Descr[MAX_OCTETSTRING_VALUES];
+static OCTETSTRING_VALUE_DESCR OSV_Descr[MAX_OCTETSTRING_VALUES];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int OctetString_Value_Properties_Required[] = {
diff --git a/src/bacnet/basic/object/piv.c b/src/bacnet/basic/object/piv.c
index 0b556adf..5b08365b 100644
--- a/src/bacnet/basic/object/piv.c
+++ b/src/bacnet/basic/object/piv.c
@@ -44,7 +44,7 @@
 #define MAX_POSITIVEINTEGER_VALUES 4
 #endif
 
-POSITIVEINTEGER_VALUE_DESCR PIV_Descr[MAX_POSITIVEINTEGER_VALUES];
+static POSITIVEINTEGER_VALUE_DESCR PIV_Descr[MAX_POSITIVEINTEGER_VALUES];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */
 static const int PositiveInteger_Value_Properties_Required[] = {
diff --git a/src/bacnet/basic/object/schedule.c b/src/bacnet/basic/object/schedule.c
index 33586a19..c30cb7a8 100644
--- a/src/bacnet/basic/object/schedule.c
+++ b/src/bacnet/basic/object/schedule.c
@@ -41,7 +41,7 @@
 #define MAX_SCHEDULES 4
 #endif
 
-SCHEDULE_DESCR Schedule_Descr[MAX_SCHEDULES];
+static SCHEDULE_DESCR Schedule_Descr[MAX_SCHEDULES];
 
 static const int Schedule_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
     PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE,
diff --git a/src/bacnet/basic/object/trendlog.c b/src/bacnet/basic/object/trendlog.c
index c1387d5d..29ea1262 100644
--- a/src/bacnet/basic/object/trendlog.c
+++ b/src/bacnet/basic/object/trendlog.c
@@ -49,7 +49,7 @@
 #define MAX_TREND_LOGS 8
 #endif
 
-TL_DATA_REC Logs[MAX_TREND_LOGS][TL_MAX_ENTRIES];
+static TL_DATA_REC Logs[MAX_TREND_LOGS][TL_MAX_ENTRIES];
 static TL_LOG_INFO LogInfo[MAX_TREND_LOGS];
 
 /* These three arrays are used by the ReadPropertyMultiple handler */