diff --git a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk
index fa00b92..a632ec4 100644
--- a/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk
+++ b/self-extractors_oriole/root/proprietary/BoardConfigVendor.mk
@@ -12,6 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := oriole/BoardConfigPartial.mk
-
--include vendor/google_devices/$(LOCAL_STEM)
+-include vendor/google_devices/oriole/BoardConfigPartial.mk
diff --git a/self-extractors_oriole/root/proprietary/device-vendor.mk b/self-extractors_oriole/root/proprietary/device-vendor.mk
index aa3ae50..2c4443b 100644
--- a/self-extractors_oriole/root/proprietary/device-vendor.mk
+++ b/self-extractors_oriole/root/proprietary/device-vendor.mk
@@ -12,6 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := oriole/device-partial.mk
-
-$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/google_devices/oriole/BoardConfigPartial.mk)
diff --git a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk
index 25a880e..6e788fc 100644
--- a/self-extractors_raven/root/proprietary/BoardConfigVendor.mk
+++ b/self-extractors_raven/root/proprietary/BoardConfigVendor.mk
@@ -12,6 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := raven/BoardConfigPartial.mk
-
--include vendor/google_devices/$(LOCAL_STEM)
+-include vendor/google_devices/raven/BoardConfigPartial.mk
diff --git a/self-extractors_raven/root/proprietary/device-vendor.mk b/self-extractors_raven/root/proprietary/device-vendor.mk
index 4877f39..2be1993 100644
--- a/self-extractors_raven/root/proprietary/device-vendor.mk
+++ b/self-extractors_raven/root/proprietary/device-vendor.mk
@@ -12,6 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_STEM := raven/device-partial.mk
-
-$(call inherit-product-if-exists, vendor/google_devices/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/google_devices/raven/device-partial.mk)