diff --git a/common/tegra_hwpm_alist_utils.c b/common/tegra_hwpm_alist_utils.c
index efc309e..fb8b5e4 100644
--- a/common/tegra_hwpm_alist_utils.c
+++ b/common/tegra_hwpm_alist_utils.c
@@ -159,4 +159,4 @@ alist_unmap:
 	}
 
 	return err;
-}
\ No newline at end of file
+}
diff --git a/hal/t234/ip/display/t234_hwpm_ip_display.c b/hal/t234/ip/display/t234_hwpm_ip_display.c
index f122f16..01bd438 100644
--- a/hal/t234/ip/display/t234_hwpm_ip_display.c
+++ b/hal/t234/ip/display/t234_hwpm_ip_display.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_display_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_display_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_DISPLAY_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_display_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_display_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_display_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_DISPLAY_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -56,7 +56,7 @@ struct hwpm_ip_aperture t234_display_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_display_inst_static_array[
+static struct hwpm_ip_inst t234_display_inst_static_array[
 	T234_HWPM_IP_DISPLAY_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/isp/t234_hwpm_ip_isp.c b/hal/t234/ip/isp/t234_hwpm_ip_isp.c
index 82dc04f..4d01f16 100644
--- a/hal/t234/ip/isp/t234_hwpm_ip_isp.c
+++ b/hal/t234/ip/isp/t234_hwpm_ip_isp.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_isp_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_isp_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_ISP_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_isp_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_isp_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_isp_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_ISP_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -56,7 +56,7 @@ struct hwpm_ip_aperture t234_isp_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_isp_inst_static_array[
+static struct hwpm_ip_inst t234_isp_inst_static_array[
 	T234_HWPM_IP_ISP_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.c b/hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.c
index eb7e26c..71154f4 100644
--- a/hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.c
+++ b/hal/t234/ip/mgbe/t234_hwpm_ip_mgbe.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_mgbe_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_mgbe_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mgbe_inst1_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst1_perfmon_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -55,7 +55,7 @@ struct hwpm_ip_aperture t234_mgbe_inst1_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mgbe_inst2_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst2_perfmon_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -74,7 +74,7 @@ struct hwpm_ip_aperture t234_mgbe_inst2_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mgbe_inst3_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst3_perfmon_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -93,7 +93,7 @@ struct hwpm_ip_aperture t234_mgbe_inst3_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mgbe_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -112,7 +112,7 @@ struct hwpm_ip_aperture t234_mgbe_inst0_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mgbe_inst1_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst1_perfmux_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -131,7 +131,7 @@ struct hwpm_ip_aperture t234_mgbe_inst1_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mgbe_inst2_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst2_perfmux_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -150,7 +150,7 @@ struct hwpm_ip_aperture t234_mgbe_inst2_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mgbe_inst3_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mgbe_inst3_perfmux_element_static_array[
 	T234_HWPM_IP_MGBE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -170,7 +170,7 @@ struct hwpm_ip_aperture t234_mgbe_inst3_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_mgbe_inst_static_array[
+static struct hwpm_ip_inst t234_mgbe_inst_static_array[
 	T234_HWPM_IP_MGBE_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.c b/hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.c
index 47d1813..b7898cf 100644
--- a/hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.c
+++ b/hal/t234/ip/mss_channel/t234_hwpm_ip_mss_channel.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_mss_channel_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mss_channel_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_MSS_CHANNEL_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -261,7 +261,7 @@ struct hwpm_ip_aperture t234_mss_channel_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mss_channel_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mss_channel_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_MSS_CHANNEL_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -406,7 +406,8 @@ struct hwpm_ip_aperture t234_mss_channel_inst0_perfmux_element_static_array[
 		.name = {'\0'},
 		.start_abs_pa = addr_map_mc9_base_r(),
 		.end_abs_pa = addr_map_mc9_limit_r(),
-		.fake_registers = NULL,
+		.start_pa = 0ULL,
+		.end_pa = 0ULL,
 		.base_pa = 0ULL,
 		.alist = t234_mss_channel_alist,
 		.alist_size = ARRAY_SIZE(t234_mss_channel_alist),
@@ -504,7 +505,7 @@ struct hwpm_ip_aperture t234_mss_channel_inst0_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mss_channel_inst0_broadcast_element_static_array[
+static struct hwpm_ip_aperture t234_mss_channel_inst0_broadcast_element_static_array[
 	T234_HWPM_IP_MSS_CHANNEL_NUM_BROADCAST_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_BROADCAST,
@@ -524,7 +525,7 @@ struct hwpm_ip_aperture t234_mss_channel_inst0_broadcast_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_mss_channel_inst_static_array[
+static struct hwpm_ip_inst t234_mss_channel_inst_static_array[
 	T234_HWPM_IP_MSS_CHANNEL_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.c b/hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.c
index 95f068b..371a6d5 100644
--- a/hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.c
+++ b/hal/t234/ip/mss_gpu_hub/t234_hwpm_ip_mss_gpu_hub.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_mss_gpu_hub_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mss_gpu_hub_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_MSS_GPU_HUB_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_mss_gpu_hub_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mss_gpu_hub_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mss_gpu_hub_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_MSS_GPU_HUB_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -161,7 +161,7 @@ struct hwpm_ip_aperture t234_mss_gpu_hub_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_mss_gpu_hub_inst_static_array[
+static struct hwpm_ip_inst t234_mss_gpu_hub_inst_static_array[
 	T234_HWPM_IP_MSS_GPU_HUB_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.c b/hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.c
index faf3121..65c7547 100644
--- a/hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.c
+++ b/hal/t234/ip/mss_iso_niso_hubs/t234_hwpm_ip_mss_iso_niso_hubs.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_MSS_ISO_NISO_HUBS_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -51,7 +51,7 @@ struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_perfmon_element_static_array
 	},
 };
 
-struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_MSS_ISO_NISO_HUBS_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -198,7 +198,7 @@ struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_perfmux_element_static_array
 	},
 };
 
-struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_broadcast_element_static_array[
+static struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_broadcast_element_static_array[
 	T234_HWPM_IP_MSS_ISO_NISO_HUBS_NUM_BROADCAST_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_BROADCAST,
@@ -218,7 +218,7 @@ struct hwpm_ip_aperture t234_mss_iso_niso_hub_inst0_broadcast_element_static_arr
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_mss_iso_niso_hub_inst_static_array[
+static struct hwpm_ip_inst t234_mss_iso_niso_hub_inst_static_array[
 	T234_HWPM_IP_MSS_ISO_NISO_HUBS_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.c b/hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.c
index 7e97bdd..5d92803 100644
--- a/hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.c
+++ b/hal/t234/ip/mss_mcf/t234_hwpm_ip_mss_mcf.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_mss_mcf_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_mss_mcf_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_MSS_MCF_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -66,7 +66,7 @@ struct hwpm_ip_aperture t234_mss_mcf_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mss_mcf_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_mss_mcf_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_MSS_MCF_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -190,7 +190,7 @@ struct hwpm_ip_aperture t234_mss_mcf_inst0_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_mss_mcf_inst0_broadcast_element_static_array[
+static struct hwpm_ip_aperture t234_mss_mcf_inst0_broadcast_element_static_array[
 	T234_HWPM_IP_MSS_MCF_NUM_BROADCAST_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_BROADCAST,
@@ -210,7 +210,7 @@ struct hwpm_ip_aperture t234_mss_mcf_inst0_broadcast_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_mss_mcf_inst_static_array[
+static struct hwpm_ip_inst t234_mss_mcf_inst_static_array[
 	T234_HWPM_IP_MSS_MCF_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.c b/hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.c
index cf5fae6..b99cadf 100644
--- a/hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.c
+++ b/hal/t234/ip/nvdec/t234_hwpm_ip_nvdec.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_nvdec_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_nvdec_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_NVDEC_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_nvdec_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_nvdec_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_nvdec_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_NVDEC_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -56,7 +56,7 @@ struct hwpm_ip_aperture t234_nvdec_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_nvdec_inst_static_array[
+static struct hwpm_ip_inst t234_nvdec_inst_static_array[
 	T234_HWPM_IP_NVDEC_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.c b/hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.c
index cc1bcae..21b0bfd 100644
--- a/hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.c
+++ b/hal/t234/ip/nvdla/t234_hwpm_ip_nvdla.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_nvdla_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_nvdla_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_NVDLA_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_nvdla_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_nvdla_inst1_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_nvdla_inst1_perfmon_element_static_array[
 	T234_HWPM_IP_NVDLA_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -55,7 +55,7 @@ struct hwpm_ip_aperture t234_nvdla_inst1_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_nvdla_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_nvdla_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_NVDLA_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -74,7 +74,7 @@ struct hwpm_ip_aperture t234_nvdla_inst0_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_nvdla_inst1_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_nvdla_inst1_perfmux_element_static_array[
 	T234_HWPM_IP_NVDLA_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -94,7 +94,7 @@ struct hwpm_ip_aperture t234_nvdla_inst1_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_nvdla_inst_static_array[
+static struct hwpm_ip_inst t234_nvdla_inst_static_array[
 	T234_HWPM_IP_NVDLA_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.c b/hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.c
index ee30893..7e7199d 100644
--- a/hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.c
+++ b/hal/t234/ip/nvenc/t234_hwpm_ip_nvenc.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_nvenc_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_nvenc_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_NVENC_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_nvenc_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_nvenc_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_nvenc_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_NVENC_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -56,7 +56,7 @@ struct hwpm_ip_aperture t234_nvenc_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_nvenc_inst_static_array[
+static struct hwpm_ip_inst t234_nvenc_inst_static_array[
 	T234_HWPM_IP_NVENC_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/ofa/t234_hwpm_ip_ofa.c b/hal/t234/ip/ofa/t234_hwpm_ip_ofa.c
index 05234de..72688ba 100644
--- a/hal/t234/ip/ofa/t234_hwpm_ip_ofa.c
+++ b/hal/t234/ip/ofa/t234_hwpm_ip_ofa.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_ofa_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_ofa_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_OFA_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_ofa_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_ofa_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_ofa_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_OFA_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -56,7 +56,7 @@ struct hwpm_ip_aperture t234_ofa_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_ofa_inst_static_array[
+static struct hwpm_ip_inst t234_ofa_inst_static_array[
 	T234_HWPM_IP_OFA_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/pcie/t234_hwpm_ip_pcie.c b/hal/t234/ip/pcie/t234_hwpm_ip_pcie.c
index 4f83875..dddb2c9 100644
--- a/hal/t234/ip/pcie/t234_hwpm_ip_pcie.c
+++ b/hal/t234/ip/pcie/t234_hwpm_ip_pcie.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_pcie_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_pcie_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst1_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst1_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -55,7 +55,7 @@ struct hwpm_ip_aperture t234_pcie_inst1_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst2_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst2_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -74,7 +74,7 @@ struct hwpm_ip_aperture t234_pcie_inst2_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst3_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst3_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -93,7 +93,7 @@ struct hwpm_ip_aperture t234_pcie_inst3_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst4_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst4_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -112,7 +112,7 @@ struct hwpm_ip_aperture t234_pcie_inst4_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst5_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst5_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -131,7 +131,7 @@ struct hwpm_ip_aperture t234_pcie_inst5_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst6_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst6_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -150,7 +150,7 @@ struct hwpm_ip_aperture t234_pcie_inst6_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst7_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst7_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -169,7 +169,7 @@ struct hwpm_ip_aperture t234_pcie_inst7_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst8_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst8_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -188,7 +188,7 @@ struct hwpm_ip_aperture t234_pcie_inst8_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst9_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst9_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -207,7 +207,7 @@ struct hwpm_ip_aperture t234_pcie_inst9_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst10_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst10_perfmon_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -226,7 +226,7 @@ struct hwpm_ip_aperture t234_pcie_inst10_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -245,7 +245,7 @@ struct hwpm_ip_aperture t234_pcie_inst0_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst1_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst1_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -264,7 +264,7 @@ struct hwpm_ip_aperture t234_pcie_inst1_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst2_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst2_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -283,7 +283,7 @@ struct hwpm_ip_aperture t234_pcie_inst2_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst3_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst3_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -302,7 +302,7 @@ struct hwpm_ip_aperture t234_pcie_inst3_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst4_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst4_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -321,7 +321,7 @@ struct hwpm_ip_aperture t234_pcie_inst4_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst5_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst5_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -340,7 +340,7 @@ struct hwpm_ip_aperture t234_pcie_inst5_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst6_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst6_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -359,7 +359,7 @@ struct hwpm_ip_aperture t234_pcie_inst6_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst7_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst7_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -378,7 +378,7 @@ struct hwpm_ip_aperture t234_pcie_inst7_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst8_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst8_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -397,7 +397,7 @@ struct hwpm_ip_aperture t234_pcie_inst8_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst9_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst9_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -416,7 +416,7 @@ struct hwpm_ip_aperture t234_pcie_inst9_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pcie_inst10_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pcie_inst10_perfmux_element_static_array[
 	T234_HWPM_IP_PCIE_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -436,7 +436,7 @@ struct hwpm_ip_aperture t234_pcie_inst10_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_pcie_inst_static_array[
+static struct hwpm_ip_inst t234_pcie_inst_static_array[
 	T234_HWPM_IP_PCIE_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/pma/t234_hwpm_ip_pma.c b/hal/t234/ip/pma/t234_hwpm_ip_pma.c
index b426830..caa1636 100644
--- a/hal/t234/ip/pma/t234_hwpm_ip_pma.c
+++ b/hal/t234/ip/pma/t234_hwpm_ip_pma.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_pma_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pma_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_PMA_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_pma_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pma_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pma_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_PMA_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMUX,
@@ -56,7 +56,7 @@ struct hwpm_ip_aperture t234_pma_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_pma_inst_static_array[
+static struct hwpm_ip_inst t234_pma_inst_static_array[
 	T234_HWPM_IP_PMA_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/pva/t234_hwpm_ip_pva.c b/hal/t234/ip/pva/t234_hwpm_ip_pva.c
index 8177f8b..3a562bb 100644
--- a/hal/t234/ip/pva/t234_hwpm_ip_pva.c
+++ b/hal/t234/ip/pva/t234_hwpm_ip_pva.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_pva_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_pva_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_PVA_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -66,7 +66,7 @@ struct hwpm_ip_aperture t234_pva_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_pva_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_pva_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_PVA_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -86,7 +86,7 @@ struct hwpm_ip_aperture t234_pva_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_pva_inst_static_array[
+static struct hwpm_ip_inst t234_pva_inst_static_array[
 	T234_HWPM_IP_PVA_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/rtr/t234_hwpm_ip_rtr.c b/hal/t234/ip/rtr/t234_hwpm_ip_rtr.c
index f100480..d41c9fd 100644
--- a/hal/t234/ip/rtr/t234_hwpm_ip_rtr.c
+++ b/hal/t234/ip/rtr/t234_hwpm_ip_rtr.c
@@ -18,7 +18,7 @@
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
 /* RTR aperture should be placed in instance T234_HWPM_IP_RTR_STATIC_RTR_INST */
-struct hwpm_ip_aperture t234_rtr_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_rtr_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_RTR_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMUX,
@@ -39,7 +39,7 @@ struct hwpm_ip_aperture t234_rtr_inst0_perfmux_element_static_array[
 
 /* PMA from RTR perspective */
 /* PMA aperture should be placed in instance T234_HWPM_IP_RTR_STATIC_PMA_INST */
-struct hwpm_ip_aperture t234_rtr_inst1_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_rtr_inst1_perfmux_element_static_array[
 	T234_HWPM_IP_RTR_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMUX,
@@ -59,7 +59,7 @@ struct hwpm_ip_aperture t234_rtr_inst1_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_rtr_inst_static_array[
+static struct hwpm_ip_inst t234_rtr_inst_static_array[
 	T234_HWPM_IP_RTR_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/scf/t234_hwpm_ip_scf.c b/hal/t234/ip/scf/t234_hwpm_ip_scf.c
index 62a9271..5f12409 100644
--- a/hal/t234/ip/scf/t234_hwpm_ip_scf.c
+++ b/hal/t234/ip/scf/t234_hwpm_ip_scf.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_scf_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_scf_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_SCF_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -37,7 +37,7 @@ struct hwpm_ip_aperture t234_scf_inst0_perfmon_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_scf_inst_static_array[
+static struct hwpm_ip_inst t234_scf_inst_static_array[
 	T234_HWPM_IP_SCF_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/vi/t234_hwpm_ip_vi.c b/hal/t234/ip/vi/t234_hwpm_ip_vi.c
index 02f850b..3192eff 100644
--- a/hal/t234/ip/vi/t234_hwpm_ip_vi.c
+++ b/hal/t234/ip/vi/t234_hwpm_ip_vi.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_vi_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_vi_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_VI_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_vi_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_vi_inst1_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_vi_inst1_perfmon_element_static_array[
 	T234_HWPM_IP_VI_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -55,7 +55,7 @@ struct hwpm_ip_aperture t234_vi_inst1_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_vi_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_vi_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_VI_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -74,7 +74,7 @@ struct hwpm_ip_aperture t234_vi_inst0_perfmux_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_vi_inst1_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_vi_inst1_perfmux_element_static_array[
 	T234_HWPM_IP_VI_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -94,7 +94,7 @@ struct hwpm_ip_aperture t234_vi_inst1_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_vi_inst_static_array[
+static struct hwpm_ip_inst t234_vi_inst_static_array[
 	T234_HWPM_IP_VI_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/ip/vic/t234_hwpm_ip_vic.c b/hal/t234/ip/vic/t234_hwpm_ip_vic.c
index c62328f..8faf4c3 100644
--- a/hal/t234/ip/vic/t234_hwpm_ip_vic.c
+++ b/hal/t234/ip/vic/t234_hwpm_ip_vic.c
@@ -17,7 +17,7 @@
 #include <hal/t234/t234_hwpm_regops_allowlist.h>
 #include <hal/t234/hw/t234_addr_map_soc_hwpm.h>
 
-struct hwpm_ip_aperture t234_vic_inst0_perfmon_element_static_array[
+static struct hwpm_ip_aperture t234_vic_inst0_perfmon_element_static_array[
 	T234_HWPM_IP_VIC_NUM_PERFMON_PER_INST] = {
 	{
 		.element_type = HWPM_ELEMENT_PERFMON,
@@ -36,7 +36,7 @@ struct hwpm_ip_aperture t234_vic_inst0_perfmon_element_static_array[
 	},
 };
 
-struct hwpm_ip_aperture t234_vic_inst0_perfmux_element_static_array[
+static struct hwpm_ip_aperture t234_vic_inst0_perfmux_element_static_array[
 	T234_HWPM_IP_VIC_NUM_PERFMUX_PER_INST] = {
 	{
 		.element_type = IP_ELEMENT_PERFMUX,
@@ -56,7 +56,7 @@ struct hwpm_ip_aperture t234_vic_inst0_perfmux_element_static_array[
 };
 
 /* IP instance array */
-struct hwpm_ip_inst t234_vic_inst_static_array[
+static struct hwpm_ip_inst t234_vic_inst_static_array[
 	T234_HWPM_IP_VIC_NUM_INSTANCES] = {
 	{
 		.hw_inst_mask = BIT(0),
diff --git a/hal/t234/t234_hwpm_interface_utils.c b/hal/t234/t234_hwpm_interface_utils.c
index 31e55b8..b62d456 100644
--- a/hal/t234/t234_hwpm_interface_utils.c
+++ b/hal/t234/t234_hwpm_interface_utils.c
@@ -21,7 +21,7 @@
 #include <hal/t234/t234_hwpm_init.h>
 #include <hal/t234/t234_hwpm_internal.h>
 
-struct tegra_soc_hwpm_chip t234_chip_info = {
+static struct tegra_soc_hwpm_chip t234_chip_info = {
 	.chip_ips = NULL,
 
 	/* HALs */
diff --git a/os/linux/tegra_hwpm_debugfs.c b/os/linux/tegra_hwpm_debugfs.c
index f2d5cf7..fcc9336 100644
--- a/os/linux/tegra_hwpm_debugfs.c
+++ b/os/linux/tegra_hwpm_debugfs.c
@@ -17,6 +17,7 @@
 #include <tegra_hwpm_log.h>
 #include <tegra_hwpm_io.h>
 #include <tegra_hwpm.h>
+#include <tegra_hwpm_debugfs.h>
 
 /* FIXME: This is a placeholder for now. We can add debugfs nodes as needed. */
 void tegra_hwpm_debugfs_init(struct tegra_soc_hwpm *hwpm)