diff --git a/Makefile b/Makefile
index c7e16ccf..cd12a56b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0
-# Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
+# Copyright (c) 2022-2023, NVIDIA CORPORATION.  All rights reserved.
 
 LINUXINCLUDE += -I$(srctree.nvidia-oot)/include
 
+ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
+subdir-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
+endif
+
 obj-m += drivers/
 
 ifdef CONFIG_SOUND
diff --git a/drivers/misc/nvsciipc/Makefile b/drivers/misc/nvsciipc/Makefile
index cee92e93..9ce5cf81 100644
--- a/drivers/misc/nvsciipc/Makefile
+++ b/drivers/misc/nvsciipc/Makefile
@@ -7,8 +7,4 @@
 
 ccflags-y += -I$(PWD)
 
-ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
-endif
-
 obj-m += nvsciipc.o
diff --git a/drivers/video/tegra/nvmap/Makefile b/drivers/video/tegra/nvmap/Makefile
index 34ff1291..d27e44fe 100644
--- a/drivers/video/tegra/nvmap/Makefile
+++ b/drivers/video/tegra/nvmap/Makefile
@@ -3,14 +3,10 @@
 
 GCOV_PROFILE := y
 
-subdir-ccflags-y := -Werror
+subdir-ccflags-y += -Werror
 
 include $(srctree.nvidia-oot)/drivers/video/tegra/nvmap/Makefile.memory.configs
 
-ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
-endif
-
 ifeq ($(NVMAP_CONFIG), y)
 # Build NvMap only when NVMAP_CONFIG is set to y
 nvmap-y := nvmap_core.o \
diff --git a/drivers/virt/tegra/Makefile b/drivers/virt/tegra/Makefile
index d1a49684..47f1a11c 100644
--- a/drivers/virt/tegra/Makefile
+++ b/drivers/virt/tegra/Makefile
@@ -10,8 +10,10 @@ LINUX_VERSION_6_2 := $(shell expr 6 \* 256 + 2)
 
 # tegra_hv is currently broken for Linux v6.2 and so skip for Linux v6.2+
 ifeq ($(shell test $(LINUX_VERSION) -lt $(LINUX_VERSION_6_2); echo $$?),0)
+ifdef CONFIG_TEGRA_VIRTUALIZATION
 obj-m		+= tegra_hv.o
 endif
+endif
 obj-m		+= tegra_hv_pm_ctl.o
 obj-m		+= hvc_sysfs.o
 obj-m		+= ivc-cdev.o
diff --git a/include/soc/tegra/virt/hv-ivc.h b/include/soc/tegra/virt/hv-ivc.h
index 41c9739b..4dd678e3 100644
--- a/include/soc/tegra/virt/hv-ivc.h
+++ b/include/soc/tegra/virt/hv-ivc.h
@@ -32,7 +32,7 @@ struct tegra_hv_ivm_cookie {
 	void *reserved;
 };
 
-#if (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE)
+#if (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE) && defined(CONFIG_TEGRA_VIRTUALIZATION)
 bool is_tegra_hypervisor_mode(void);
 
 /**
@@ -451,6 +451,8 @@ static inline struct tegra_ivc *tegra_hv_ivc_convert_cookie(
 {
 	return ERR_PTR(-ENOTSUPP);
 };
-#endif /* (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE) */
+#endif /* (KERNEL_VERSION(6, 2, 0) > LINUX_VERSION_CODE) &&
+	* defined(CONFIG_TEGRA_VIRTUALIZATION)
+	*/
 
 #endif /* __TEGRA_HV_IVC_H */
diff --git a/sound/soc/tegra-virt-alt/Makefile b/sound/soc/tegra-virt-alt/Makefile
index a3dfeac7..77bad808 100644
--- a/sound/soc/tegra-virt-alt/Makefile
+++ b/sound/soc/tegra-virt-alt/Makefile
@@ -3,7 +3,7 @@
 
 GCOV_PROFILE := y
 
-subdir-ccflags-y := -Werror
+subdir-ccflags-y += -Werror
 ccflags-y += -I$(overlay)/$(src)/../tegra-virt-alt/include/
 ccflags-y += -I$(overlay)/$(src)/../codecs
 ccflags-y += -I$(srctree.nvidia-oot)/sound/soc/tegra-virt-alt/nvaudio_ivc/