diff --git a/luci-app-cpufreq/Makefile b/luci-app-cpufreq/Makefile
index a5945f704..676cbf2d3 100644
--- a/luci-app-cpufreq/Makefile
+++ b/luci-app-cpufreq/Makefile
@@ -14,6 +14,6 @@ PKG_NAME:=luci-app-cpufreq
 PKG_VERSION:=1
 PKG_RELEASE:=7
 
-include ../../luci.mk
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-diskman/Makefile b/luci-app-diskman/Makefile
index 8d258c4f6..0fc535f4b 100644
--- a/luci-app-diskman/Makefile
+++ b/luci-app-diskman/Makefile
@@ -48,6 +48,6 @@ define Package/$(PKG_NAME)/postinst
 rm -fr /tmp/luci-indexcache /tmp/luci-modulecache
 endef
 
-include ../../luci.mk
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-netdata/Makefile b/luci-app-netdata/Makefile
index e4ec8fcbc..de3b86671 100644
--- a/luci-app-netdata/Makefile
+++ b/luci-app-netdata/Makefile
@@ -13,6 +13,6 @@ PKG_NAME:=luci-app-netdata
 PKG_VERSION:=1.0
 PKG_RELEASE:=3
 
-include ../../luci.mk
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-turboacc/Makefile b/luci-app-turboacc/Makefile
index 2eadbdb9c..9d70f1631 100644
--- a/luci-app-turboacc/Makefile
+++ b/luci-app-turboacc/Makefile
@@ -38,11 +38,11 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_OFFLOADING
 config PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE_DRV
 	bool "Include Shortcut-FE for ECM"
 	depends on PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE=n
-	default y if (TARGET_ipq60xxx||TARGET_ipq806x||TARGET_ipq807x)
+	default y if (TARGET_ipq60xxx|TARGET_ipq806x||TARGET_ipq807x)
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_SHORTCUT_FE
 	bool "Include Shortcut-FE"
-	default y if !(TARGET_ipq60xxx||TARGET_ipq806x||TARGET_ipq807x||TARGET_ramips)
+	default y if !(TARGET_ipq60xxx|TARGET_ipq806x||TARGET_ipq807x||TARGET_ramips)
 
 config PACKAGE_$(PKG_NAME)_INCLUDE_BBR_CCA
 	bool "Include BBR CCA"
@@ -67,6 +67,6 @@ define Package/$(PKG_NAME)/postrm
 sed -i 's/-- s:option(Flag, "fullcone", translate("Enable FullCone NAT"))/s:option(Flag, "fullcone", translate("Enable FullCone NAT"))/g' $${IPKG_INSTROOT}/usr/lib/lua/luci/model/cbi/firewall/zones.lua
 endef
 
-include ../../luci.mk
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/luci-app-zerotier/Makefile b/luci-app-zerotier/Makefile
index 4946b5f37..11c26ca4f 100644
--- a/luci-app-zerotier/Makefile
+++ b/luci-app-zerotier/Makefile
@@ -14,6 +14,6 @@ PKG_NAME:=luci-app-zerotier
 PKG_VERSION:=1.0
 PKG_RELEASE:=20
 
-include ../../luci.mk
+include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature