diff --git a/Makefile b/Makefile
index acfe092e..a91a2750 100644
--- a/Makefile
+++ b/Makefile
@@ -53,9 +53,6 @@ subdir-ccflags-y += -DNV_DROP_PCIE_ERROR_REPORTING
 # Split types and declaration of net/page_pool.h
 subdir-ccflags-y += -DNV_SPLIT_PAGE_POOL_HEADER
 
-# Unexport helpers for fd/handle conversion
-subdir-ccflags-y += -DNV_UNEXPORT_FD_HANDLE_CONVERSION
-
 # FB Deferred IO helpers name alignment
 subdir-ccflags-y += -DNV_FB_DEFERRED_IO_OPS_RENAME
 
diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c
index 6eef0560..e9ba9606 100644
--- a/drivers/gpu/drm/tegra/drm.c
+++ b/drivers/gpu/drm/tegra/drm.c
@@ -891,8 +891,10 @@ static const struct drm_driver tegra_drm_driver = {
 	.debugfs_init = tegra_debugfs_init,
 #endif
 
-#if !defined(NV_UNEXPORT_FD_HANDLE_CONVERSION)
+#if NV_IS_EXPORT_SYMBOL_PRESENT_drm_gem_prime_handle_to_fd
 	.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
+#endif
+#if NV_IS_EXPORT_SYMBOL_PRESENT_drm_gem_prime_fd_to_handle
 	.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
 #endif
 	.gem_prime_import = tegra_gem_prime_import,
diff --git a/scripts/conftest/Makefile b/scripts/conftest/Makefile
index ea751ca1..462c1a5a 100644
--- a/scripts/conftest/Makefile
+++ b/scripts/conftest/Makefile
@@ -127,7 +127,8 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_of_get_dai_name_has_index_arg
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += tc_taprio_qopt_offload_struct_has_cmd
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += tegra_dev_iommu_get_stream_id
 NV_CONFTEST_FUNCTION_COMPILE_TESTS += tegra_ivc_struct_has_iosys_map
-NV_CONFTEST_GENERIC_COMPILE_TESTS ?=
+NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_present_drm_gem_prime_fd_to_handle
+NV_CONFTEST_GENERIC_COMPILE_TESTS += is_export_symbol_present_drm_gem_prime_handle_to_fd
 NV_CONFTEST_MACRO_COMPILE_TESTS ?=
 NV_CONFTEST_SYMBOL_COMPILE_TESTS ?=
 NV_CONFTEST_TYPE_COMPILE_TESTS += request_struct_has_completion_data_arg