diff --git a/packages/lime-debug/Makefile b/packages/lime-debug/Makefile
index 85f7c2cc5..05bb2a7a4 100644
--- a/packages/lime-debug/Makefile
+++ b/packages/lime-debug/Makefile
@@ -21,7 +21,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=LiMe
 	MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
 	URL:=http://libremesh.org
-	DEPENDS:=+PACKAGE_lime-proto-batadv:batctl +bandwidth-test \
+	DEPENDS:=+bandwidth-test \
 		+busybox +ethtool +iwinfo +iw +mtr +ip +iputils-ping6 +iputils-ping \
 		+sprunge +safe-reboot +netperf +pv +tcpdump-mini +bwm-ng \
 		+lime-report
diff --git a/packages/lime-map-agent/Makefile b/packages/lime-map-agent/Makefile
index 747e10a11..e20151756 100644
--- a/packages/lime-map-agent/Makefile
+++ b/packages/lime-map-agent/Makefile
@@ -22,7 +22,7 @@ define Package/$(PKG_NAME)
 	MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
 	URL:=http://libremesh.org
 	DEPENDS:=+libremap-agent +luci-lib-libremap-location +luci-lib-libremap-system +luci-lib-libremap-wireless \
-		+PACKAGE_lime-proto-bmx6:luci-lib-libremap-bmx6 +luci-app-lime-location
+		+luci-app-lime-location
 	PKGARCH:=all
 endef
 
diff --git a/packages/lime-proto-bmx6/Makefile b/packages/lime-proto-bmx6/Makefile
index 1f49dfce0..6f706199f 100644
--- a/packages/lime-proto-bmx6/Makefile
+++ b/packages/lime-proto-bmx6/Makefile
@@ -1,7 +1,9 @@
 LIME_TITLE:=LiMe Bmx6 proto support
 LIME_MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
 LIME_DEPENDS:=+bmx6 +bmx6-json +bmx6-sms +bmx6-table +bmx6-uci-config \
-	+!PACKAGE_firewall:iptables +lime-system +lua +libuci-lua \
+	+iptables +lime-system +lua +libuci-lua \
 	+kmod-ebtables-ipv6 +ebtables
 
+include ../../libremesh.mk
+
 # call BuildPackage - OpenWrt buildroot signature
diff --git a/packages/lime-proto-wan/Makefile b/packages/lime-proto-wan/Makefile
index cab690a8f..46c7bf85d 100644
--- a/packages/lime-proto-wan/Makefile
+++ b/packages/lime-proto-wan/Makefile
@@ -1,8 +1,7 @@
 LIME_TITLE:=LiMe wan proto support
 LIME_MAINTAINER:=Gioacchino Mazzurco <gio@eigenlab.org>
-LIME_DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat \
-	+!PACKAGE_firewall:iptables
+LIME_DEPENDS:=+lime-system +lua +libuci-lua +kmod-ipt-nat +iptables
 
 include ../../libremesh.mk
 
-# call BuildPackage - OpenWrt buildroot signature
+# call BuildPackage - OpenWrt buildroot signature
\ No newline at end of file
diff --git a/packages/lime-webui/Makefile b/packages/lime-webui/Makefile
index abdb040c2..de9eb7d6c 100644
--- a/packages/lime-webui/Makefile
+++ b/packages/lime-webui/Makefile
@@ -26,8 +26,6 @@ define Package/$(PKG_NAME)
   MENU:=1
   PKGARCH:=all
   DEPENDS:=+luci-base +lime-system \
-	+PACKAGE_lime-proto-bmx6:luci-app-bmx6 \
-	+PACKAGE_lime-proto-batadv:luci-app-batman-adv \
 	+luci-mod-status +uhttpd +libiwinfo-lua \
 	+luci-theme-bootstrap +luci-i18n-base-en \
 	+LIMEWEBUI_ES:luci-i18n-base-es +LIMEWEBUI_PT:luci-i18n-base-pt \
diff --git a/packages/shared-state-dnsmasq_leases/Makefile b/packages/shared-state-dnsmasq_leases/Makefile
index ca53bf04f..1d2276a4a 100644
--- a/packages/shared-state-dnsmasq_leases/Makefile
+++ b/packages/shared-state-dnsmasq_leases/Makefile
@@ -19,7 +19,7 @@ define Package/$(PKG_NAME)
 	CATEGORY:=LiMe
 	MAINTAINER:=Gioacchino Mazzurco <gio@altermundi.net>
 	URL:=http://libremesh.org
-	DEPENDS:=@(!PACKAGE_dnsmasq-lease-share) +libuci-lua +lua \
+	DEPENDS:=+libuci-lua +lua \
 		+luci-lib-jsonc shared-state +shared-state-dnsmasq_hosts \
 		+luci-lib-nixio
 	PKGARCH:=all