diff --git a/config/Android.bp b/config/Android.bp
index cdef68e..0ecfa00 100644
--- a/config/Android.bp
+++ b/config/Android.bp
@@ -362,3 +362,24 @@
         },
     },
 }
+
+soong_config_module_type {
+    name: "surfaceflinger_qcom_extensions",
+    module_type: "cc_defaults",
+    config_namespace: "omniQcomVars",
+    value_variables: ["qcom_display_headers_namespace"],
+    properties: [
+        "cppflags",
+        "header_libs",
+    ],
+}
+
+surfaceflinger_qcom_extensions {
+    name: "surfaceflinger_qcom_ext_defaults",
+    soong_config_variables: {
+        qcom_display_headers_namespace: {
+            cppflags: ["-DQCOM_UM_FAMILY"],
+            header_libs: ["//%s:display_intf_headers"],
+        },
+    },
+}
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index ac30ff0..58a5f34 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -85,3 +85,7 @@
     hardware/qcom-caf/wlan/qcwcn/wpa_supplicant_8_lib
 
 PRODUCT_SOONG_NAMESPACES += hardware/qcom-caf/wlan
+
+SOONG_CONFIG_omniQcomVars += \
+    qcom_display_headers_namespace
+SOONG_CONFIG_omniQcomVars_qcom_display_headers_namespace := vendor/qcom/opensource/commonsys-intf/display