diff --git a/media_driver/agnostic/common/hw/vdbox/media_srcs.cmake b/media_driver/agnostic/common/hw/vdbox/media_srcs.cmake
index 184928a806..650b8ea782 100644
--- a/media_driver/agnostic/common/hw/vdbox/media_srcs.cmake
+++ b/media_driver/agnostic/common/hw/vdbox/media_srcs.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2022, Intel Corporation
+# Copyright (c) 2017-2023, Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -23,6 +23,7 @@ set(TMP_SOURCES_
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_huc_interface.cpp
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_mfx_interface.cpp
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_vdenc_interface.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_interface.cpp
 )
 
 set(TMP_HEADERS_
@@ -34,6 +35,8 @@ set(TMP_HEADERS_
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_mfx_interface.h
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_vdenc_generic.h
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_vdenc_interface.h
+    ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_interface.h
+    ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_generic.h
 )
 
 set(COMMON_SOURCES_
diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h b/media_driver/agnostic/common/hw/vdbox/mhw_vdbox_avp_generic.h
similarity index 100%
rename from media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_generic.h
rename to media_driver/agnostic/common/hw/vdbox/mhw_vdbox_avp_generic.h
diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_interface.cpp b/media_driver/agnostic/common/hw/vdbox/mhw_vdbox_avp_interface.cpp
similarity index 100%
rename from media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_interface.cpp
rename to media_driver/agnostic/common/hw/vdbox/mhw_vdbox_avp_interface.cpp
diff --git a/media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_interface.h b/media_driver/agnostic/common/hw/vdbox/mhw_vdbox_avp_interface.h
similarity index 100%
rename from media_driver/agnostic/gen12/hw/vdbox/mhw_vdbox_avp_interface.h
rename to media_driver/agnostic/common/hw/vdbox/mhw_vdbox_avp_interface.h
diff --git a/media_driver/agnostic/gen12/hw/vdbox/media_srcs.cmake b/media_driver/agnostic/gen12/hw/vdbox/media_srcs.cmake
index d58b43af9c..cb6dc1a237 100644
--- a/media_driver/agnostic/gen12/hw/vdbox/media_srcs.cmake
+++ b/media_driver/agnostic/gen12/hw/vdbox/media_srcs.cmake
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2022, Intel Corporation
+# Copyright (c) 2017-2023, Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -28,7 +28,6 @@ set(TMP_SOURCES_
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_vdenc_hwcmd_g12_X.cpp
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_g12_X.cpp
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_hwcmd_g12_X.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_interface.cpp
 )
 
 set(TMP_HEADERS_
@@ -42,9 +41,7 @@ set(TMP_HEADERS_
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_vdenc_g12_X.h
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_vdenc_hwcmd_g12_X.h
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_g12_X.h
-    ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_generic.h
     ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_hwcmd_g12_X.h
-    ${CMAKE_CURRENT_LIST_DIR}/mhw_vdbox_avp_interface.h
 )