diff --git a/core/main.mk b/core/main.mk
index 7f3d706e80..e671722f57 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -427,8 +427,8 @@ SDK_ONLY := true
 endif
 
 ifeq ($(SDK_ONLY),true)
-include $(TOPDIR)sdk/build/sdk_only_whitelist.mk
-include $(TOPDIR)development/build/sdk_only_whitelist.mk
+include $(TOPDIR)sdk/build/windows_sdk_whitelist.mk
+include $(TOPDIR)development/build/windows_sdk_whitelist.mk
 
 # Exclude tools/acp when cross-compiling windows under linux
 ifeq ($(findstring Linux,$(UNAME)),)
diff --git a/target/product/core.mk b/target/product/core.mk
index ef640b8e1e..0e7aad60da 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -70,7 +70,6 @@ PRODUCT_PACKAGES += \
     libstagefright_soft_vpxenc \
     libvariablespeed \
     libwebrtc_audio_preprocessing \
-    lint \
     mdnsd \
     mms-common \
     requestsync \
diff --git a/target/product/mini.mk b/target/product/mini.mk
index 754e5df61b..60c0fc6338 100644
--- a/target/product/mini.mk
+++ b/target/product/mini.mk
@@ -142,7 +142,6 @@ PRODUCT_PACKAGES += \
     libwebrtc_audio_preprocessing \
     libwilhelm \
     libz \
-    lint \
     mdnsd \
     network \
     pand \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index b40b8c39ee..170080a540 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -54,11 +54,6 @@ PRODUCT_PACKAGES := \
 	CubeLiveWallpapers \
 	QuickSearchBox \
 	WidgetPreview \
-	monkeyrunner \
-	guavalib \
-	jsr305lib \
-	jython \
-	jsilver \
 	librs_jni \
 	ConnectivityTest \
 	GpsLocationTest \