diff --git a/config/common_full_tablet.mk b/config/common_full_tablet.mk
index 52031978..f4cc6cd6 100644
--- a/config/common_full_tablet.mk
+++ b/config/common_full_tablet.mk
@@ -1,9 +1,10 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
 # Inherit full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_full.mk)
 
 # Required packages
 PRODUCT_PACKAGES += \
-    androidx.window.extensions \
     LatinIME
 
 # Include Lineage LatinIME dictionaries
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index 20361dec..d443fe4c 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -1,9 +1,10 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
 # Inherit full common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_full.mk)
 
 # Required packages
 PRODUCT_PACKAGES += \
-    androidx.window.extensions \
     LatinIME
 
 # Include Lineage LatinIME dictionaries
diff --git a/config/common_mini_tablet.mk b/config/common_mini_tablet.mk
index edc3cf05..c8b0b691 100644
--- a/config/common_mini_tablet.mk
+++ b/config/common_mini_tablet.mk
@@ -1,9 +1,10 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
 # Inherit mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mini.mk)
 
 # Required packages
 PRODUCT_PACKAGES += \
-    androidx.window.extensions \
     LatinIME
 
 $(call inherit-product, vendor/lineage/config/telephony.mk)
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
index 026183ba..6869d47f 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -1,7 +1,8 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/window_extensions.mk)
+
 # Inherit mini common Lineage stuff
 $(call inherit-product, vendor/lineage/config/common_mini.mk)
 
 # Required packages
 PRODUCT_PACKAGES += \
-    androidx.window.extensions \
     LatinIME