diff --git a/device.mk b/device.mk
index 288832e..7da5662 100644
--- a/device.mk
+++ b/device.mk
@@ -757,27 +757,14 @@ endif
 ####################################
 
 # Video
-PRODUCT_SOONG_NAMESPACES += vendor/google/media/bigwave
-
-$(call soong_config_set,bigw,soc,zuma)
-
-PRODUCT_PACKAGES += \
-	google.hardware.media.c2@2.0-service \
-	libgc2_bw_store \
-	libgc2_bw_base \
-	libgc2_bw_av1_dec \
-	libgc2_bw_av1_enc \
-	libbw_av1dec \
-	libbw_av1enc \
-	libgc2_bw_cwl \
-	libgc2_bw_log \
-	libgc2_bw_utils
-
 # 1. Codec 2.0
 # for settings used by different C2 hal
 include device/google/gs-common/mediacodec/common/mediacodec_common.mk
 # for Exynos C2 Hal
 include device/google/gs-common/mediacodec/samsung/mediacodec_samsung.mk
+# for Bigwave C2 Hal
+include device/google/gs-common/mediacodec/bigwave/mediacodec_bigwave.mk
+$(call soong_config_set,bigw,soc,zuma)
 
 PRODUCT_COPY_FILES += \
 	device/google/zumapro/media_codecs_performance_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_c2.xml \