diff --git a/fingerprint/Android.bp b/fingerprint/Android.bp
index 3ffc5d483..043f1b914 100644
--- a/fingerprint/Android.bp
+++ b/fingerprint/Android.bp
@@ -7,10 +7,11 @@
 cc_library_static {
     name: "libudfps_extension.samsung",
     srcs: ["UdfpsExtension.cpp"],
+    cflags: select(soong_config_variable("samsung_udfps", "dimlayerzorder"), {
+        any @ zorder: ["-DFOD_PRESSED_LAYER_ZORDER=" + zorder],
+        default: [],
+    }),
     include_dirs: [
         "frameworks/native/services/surfaceflinger/CompositionEngine/include",
     ],
-    header_libs: [
-        "generated_kernel_headers",
-    ],
 }
diff --git a/fingerprint/UdfpsExtension.cpp b/fingerprint/UdfpsExtension.cpp
index aaacd9d05..1d344fde2 100644
--- a/fingerprint/UdfpsExtension.cpp
+++ b/fingerprint/UdfpsExtension.cpp
@@ -7,12 +7,6 @@
 
 #include <compositionengine/UdfpsExtension.h>
 
-#if __has_include(<display/drm/sde_drm.h>)
-#include <display/drm/sde_drm.h>
-#elif __has_include(<drm/sde_drm.h>)
-#include <drm/sde_drm.h>
-#endif
-
 uint32_t getUdfpsDimZOrder(uint32_t z) {
     return z;
 }