diff --git a/build/core/config.mk b/build/core/config.mk
index 71a73d0e..3bf8e2c0 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -22,8 +22,5 @@ FRAMEWORK_LINEAGE_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/lineage/build/core/ap
 
 BUILD_RRO_SYSTEM_PACKAGE := $(TOPDIR)vendor/lineage/build/core/system_rro.mk
 
-# Rules for MTK targets
-include $(TOPDIR)vendor/lineage/build/core/mtk_target.mk
-
 # Rules for QCOM targets
 include $(TOPDIR)vendor/lineage/build/core/qcom_target.mk
diff --git a/build/core/definitions.mk b/build/core/definitions.mk
index 1cd5a92f..82ed55d4 100644
--- a/build/core/definitions.mk
+++ b/build/core/definitions.mk
@@ -5,5 +5,8 @@ define uniq
 $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 endef
 
-# Include QCOM macros
-include vendor/lineage/build/core/qcom_utils.mk
+# Include board/platform macros
+include vendor/lineage/build/core/utils.mk
+
+# Include vendor platform definitions
+include vendor/lineage/build/core/vendor/*.mk
diff --git a/build/core/mtk_target.mk b/build/core/mtk_target.mk
deleted file mode 100644
index 576e3833..00000000
--- a/build/core/mtk_target.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Bring in Mediatek helper macros
-include vendor/lineage/build/core/mtk_utils.mk
diff --git a/build/core/qcom_utils.mk b/build/core/utils.mk
similarity index 84%
rename from build/core/qcom_utils.mk
rename to build/core/utils.mk
index f36ecaa0..23bd4c9b 100644
--- a/build/core/qcom_utils.mk
+++ b/build/core/utils.mk
@@ -1,48 +1,3 @@
-# Board platforms lists to be used for
-# TARGET_BOARD_PLATFORM specific featurization
-
-# A Family
-QCOM_BOARD_PLATFORMS += msm7x27a
-QCOM_BOARD_PLATFORMS += msm7x30
-QCOM_BOARD_PLATFORMS += msm8660
-
-QCOM_BOARD_PLATFORMS += msm8960
-
-# B Family
-QCOM_BOARD_PLATFORMS += msm8226
-QCOM_BOARD_PLATFORMS += msm8610
-QCOM_BOARD_PLATFORMS += msm8974
-
-QCOM_BOARD_PLATFORMS += apq8084
-
-# B64 Family
-QCOM_BOARD_PLATFORMS += msm8992
-QCOM_BOARD_PLATFORMS += msm8994
-
-# BR Family
-QCOM_BOARD_PLATFORMS += msm8909
-QCOM_BOARD_PLATFORMS += msm8916
-
-QCOM_BOARD_PLATFORMS += msm8952
-
-# UM Family
-QCOM_BOARD_PLATFORMS += msm8937
-QCOM_BOARD_PLATFORMS += msm8953
-QCOM_BOARD_PLATFORMS += msm8996
-QCOM_BOARD_PLATFORMS += msm8998
-
-QCOM_BOARD_PLATFORMS += sdm660
-QCOM_BOARD_PLATFORMS += sdm845
-
-# MSM7000 Family
-MSM7K_BOARD_PLATFORMS := msm7x30
-MSM7K_BOARD_PLATFORMS += msm7x27
-MSM7K_BOARD_PLATFORMS += msm7x27a
-MSM7K_BOARD_PLATFORMS += msm7k
-
-QSD8K_BOARD_PLATFORMS := qsd8k
-
-
 # vars for use by utils
 empty :=
 space := $(empty) $(empty)
diff --git a/build/core/mtk_utils.mk b/build/core/vendor/mtk_boards.mk
similarity index 100%
rename from build/core/mtk_utils.mk
rename to build/core/vendor/mtk_boards.mk
diff --git a/build/core/vendor/qcom_boards.mk b/build/core/vendor/qcom_boards.mk
new file mode 100644
index 00000000..4fcb0db7
--- /dev/null
+++ b/build/core/vendor/qcom_boards.mk
@@ -0,0 +1,43 @@
+# Board platforms lists to be used for
+# TARGET_BOARD_PLATFORM specific featurization
+
+# A Family
+QCOM_BOARD_PLATFORMS += msm7x27a
+QCOM_BOARD_PLATFORMS += msm7x30
+QCOM_BOARD_PLATFORMS += msm8660
+
+QCOM_BOARD_PLATFORMS += msm8960
+
+# B Family
+QCOM_BOARD_PLATFORMS += msm8226
+QCOM_BOARD_PLATFORMS += msm8610
+QCOM_BOARD_PLATFORMS += msm8974
+
+QCOM_BOARD_PLATFORMS += apq8084
+
+# B64 Family
+QCOM_BOARD_PLATFORMS += msm8992
+QCOM_BOARD_PLATFORMS += msm8994
+
+# BR Family
+QCOM_BOARD_PLATFORMS += msm8909
+QCOM_BOARD_PLATFORMS += msm8916
+
+QCOM_BOARD_PLATFORMS += msm8952
+
+# UM Family
+QCOM_BOARD_PLATFORMS += msm8937
+QCOM_BOARD_PLATFORMS += msm8953
+QCOM_BOARD_PLATFORMS += msm8996
+QCOM_BOARD_PLATFORMS += msm8998
+
+QCOM_BOARD_PLATFORMS += sdm660
+QCOM_BOARD_PLATFORMS += sdm845
+
+# MSM7000 Family
+MSM7K_BOARD_PLATFORMS := msm7x30
+MSM7K_BOARD_PLATFORMS += msm7x27
+MSM7K_BOARD_PLATFORMS += msm7x27a
+MSM7K_BOARD_PLATFORMS += msm7k
+
+QSD8K_BOARD_PLATFORMS := qsd8k