diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 0186191a6d9e19c1ea62a19eb66a30908d1e0ea6..f93cf4accab9e65866fddd16c3a6453e9a89e236 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -103,13 +103,6 @@ define Build/InstallDev
install-libs
endef
-define Build/UninstallDev
- -$(MAKE) -C $(PKG_BUILD_DIR) \
- BUILDCC="$(HOSTCC)" \
- DESTDIR="$(STAGING_DIR)" \
- uninstall-libs
-endef
-
define Package/e2fsprogs/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/e2fsck $(1)/usr/sbin/
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index 2f249223f702f306882a4f508e905a9ac175f379..8d280e163e2bc63d5ddb98060b9b4f06aa029448 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -117,12 +117,6 @@ define Build/InstallDev
$(SED) 's,-I$$$${includedir}/fuse,,g' $(1)/usr/lib/pkgconfig/fuse.pc
$(SED) 's,-L$$$${libdir},,g' $(1)/usr/lib/pkgconfig/fuse.pc
endef
-
-define Build/UninstallDev
- rm -rf $(1)/usr/include/fuse{,.h} \
- $(1)/usr/lib/libfuse.{a,so*} \
- $(1)/usr/lib/pkgconfig/fuse.pc
-endef
define Package/fuse-utils/install
$(INSTALL_DIR) $(1)/usr/bin
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index aff46a933e84c2f2ff465bcbc024c0157d500631..9915c06eada7ccf6b484c1106c2493d6390bd5c1 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -45,11 +45,6 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.{a,so*} $(1)/usr/lib/
endef
-define Build/UninstallDev
- rm -rf $(1)/usr/include/gmp* \
- $(1)/usr/lib/libgmp.{a,so*}
-endef
-
define Package/libgmp/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgmp.so.* $(1)/usr/lib/
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 80646cd667ce690de55c8923b81dd4002b807585..aefc7ddce89f6b7ea06ef3e5d5d3f548e362f9d2 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -235,18 +235,6 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/libiptc/libiptc.a $(1)/usr/lib
endef
-define Build/UninstallDev
- rm -rf $(1)/usr/include/libipq.h
- rm -rf $(1)/usr/include/libipulog
- rm -rf $(1)/usr/include/libipq
- rm -rf $(1)/usr/include/libiptc
- rm -rf $(1)/usr/include/linux/netfilter*
- rm -rf $(1)/usr/include/iptables*
- rm -rf $(1)/usr/include/ip6tables*
- rm -rf $(1)/usr/lib/libipq.a
- rm -rf $(1)/usr/lib/libiptc.a
-endef
-
define Package/iptables/install
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall
diff --git a/package/keynote/Makefile b/package/keynote/Makefile
index 1aea7cbc608fee085ef6230b591347f1215f494f..5b27257b4a74ddb3831210a5fea861f381f3d3af 100644
--- a/package/keynote/Makefile
+++ b/package/keynote/Makefile
@@ -47,11 +47,6 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/libkeynote.a $(1)/usr/lib/
endef
-define Build/UninstallDev
- rm -rf $(1)/usr/include/keynote \
- $(1)/usr/lib/libkeynote.a
-endef
-
define Package/keynote/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/keynote $(1)/usr/sbin/
diff --git a/package/libjson-c/Makefile b/package/libjson-c/Makefile
index bcb298418d001d1c1d98f27b1dd9daf6fa5b9ee4..f713cc61574a9e95ba02d03c48e64b1327409790 100644
--- a/package/libjson-c/Makefile
+++ b/package/libjson-c/Makefile
@@ -44,12 +44,6 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/json.pc $(1)/usr/lib/pkgconfig/
endef
-define Build/UninstallDev
- rm -rf $(1)/usr/include/json \
- $(1)/usr/lib/libjson.{a,so*} \
- $(1)/usr/lib/pkgconfig/json.pc
-endef
-
define Package/libjson/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libjson.so.* $(1)/usr/lib/
diff --git a/package/libnl/Makefile b/package/libnl/Makefile
index 85a524861c1bae83421a7e497654dc45d7cd3d68..3303260d4edf6d65945f6dc95a8be73445c03c78 100644
--- a/package/libnl/Makefile
+++ b/package/libnl/Makefile
@@ -43,9 +43,6 @@ ifneq ($(CONFIG_LINUX_2_6_23),)
$(CP) $(PKG_BUILD_DIR)/include/linux $(1)/usr/include/libnl/
endef
- define Build/UninstallDev
- endef
-
define Package/libnl/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libnl.so.1 $(1)/usr/lib/
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index bd039f911dfa5c4b5fbc3fddff91922614086edf..d7956a61b83ca4ba45922351e567fe3f4e811e7a 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -54,11 +54,6 @@ define Build/InstallDev
$(1)/usr/lib/
endef
-define Build/UninstallDev
- rm -rf $(1)/usr/include/pcap{,-bpf,-namedb}.h \
- $(1)/usr/lib/libpcap.{a,so*}
-endef
-
define Package/libpcap/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index f67294e081020adf1ba5f5f922a4f6fbbcdd118f..4f9b4f612d95ebabe776218194ebe2aaf643d3ad 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -67,11 +67,6 @@ ifneq ($(CONFIG_PACKAGE_linux-atm),)
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libatm.{a,so*} \
$(1)/usr/lib/
endef
-
- define Build/UninstallDev
- rm -rf $(1)/usr/include/atm{,d,sap}.h \
- $(1)/usr/lib/libatm.{a,so*}
- endef
endif
define Package/linux-atm/install
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 42f8ad232bfc487182c5a99146b5b97af6cdcd77..723ba77be5a6c5634501520cc67ae832707b10b7 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -63,10 +63,6 @@ ifeq ($(CONFIG_LINUX_2_6_23),y)
$(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
endef
- define Build/UninstallDev
- rm -rf $(1)/usr/include/mac80211
- endef
-
define KernelPackage/mac80211/install
$(INSTALL_DIR) $(1)/lib/wifi
$(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 3f6be3f9ca3a97d2b74dc8ab3d2f3639776391f7..3c72bc73072f983a6cea5ded5eaacf9bf26a857c 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -155,10 +155,6 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/
endef
-define Build/UninstallDev
- rm -rf $(1)/usr/include/madwifi
-endef
-
define KernelPackage/madwifi/install
$(INSTALL_DIR) $(1)/lib/wifi
$(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 6da4299e8150b2b40c9ae8585d1387578e67512e..51a5a0a1abb0cbf83eced11ce5e19b1f2d229313 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -155,19 +155,4 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
endef
-define Build/UninstallDev
- rm -rf \
- $(1)/usr/include/curses.h \
- $(1)/usr/include/ncurses.h \
- $(1)/usr/include/ncurses_dll.h \
- $(1)/usr/include/menu.h \
- $(1)/usr/include/panel.h \
- $(1)/usr/include/term{,cap}.h \
- $(1)/usr/include/unctrl.h \
- $(1)/usr/include/form.h \
- $(1)/usr/include/eti.h \
- $(1)/usr/lib/libcurses.so \
- $(1)/usr/lib/lib{ncurses,panel,menu,form}.{a,so*}
-endef
-
$(eval $(call BuildPackage,libncurses))
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index 2bcc3afcf44390d746607ed822189808bee36f9d..6020bfc0549283ce205be7e2831799ad80f5a170 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -34,10 +34,6 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/lib{nvram,shared}*.so $(1)/usr/lib/
endef
-define Build/UninstallDev
- rm -f $(1)/usr/lib/lib{nvram,shared}*.so
-endef
-
define Package/nvram/install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index 4a6dcdbe5e3c79896a8318c5429e03c89c78e47b..86c584b7eb6f48b925bb8daeb80d6753031cfd45 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -118,12 +118,6 @@ define Build/InstallDev
$(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
endef
-define Build/UninstallDev
- rm -rf $(1)/usr/include/openssl \
- $(1)/usr/lib/lib{crypto,ssl}.{a,so*} \
- $(1)/usr/lib/pkgconfig/{openssl,libcrypto,libssl}.pc
-endef
-
define Package/libopenssl/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{crypto,ssl}.so.* $(1)/usr/lib/
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index e66b2e3a490650d9115ca323ba1857f50648132d..79b6ee08fbd6d2be4aaf10e78fb006eb7ec6f90a 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -55,11 +55,6 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/libiw.so* $(1)/usr/lib/
ln -sf libiw.so.$(PKG_VERSION) $(1)/usr/lib/libiw.so
endef
-
-define Build/UninstallDev
- rm -f $(1)/usr/include/{iwlib,wireless}.h \
- $(1)/usr/lib/libiw.so*
-endef
define Package/wireless-tools/install
$(INSTALL_DIR) $(1)/usr/sbin
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 19dc3e65b12a1e95f01b489df0cca146b7b3d562..9cf92197b7b8c5099e009ebfd3f3267ebf8b80da 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -56,11 +56,6 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
$(1)/usr/lib/
endef
-
-define Build/UninstallDev
- rm -rf $(1)/usr/include/z{conf,lib}.h \
- $(1)/usr/lib/libz.{a,so*}
-endef
# libz.so is needed for openssl (zlib-dynamic)
define Package/zlib/install