diff --git a/core/binary.mk b/core/binary.mk
index f20a6a6..f1ffca1 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -282,7 +282,7 @@
 
 $(proto_generated_cc_sources): PRIVATE_ARM_MODE := $(normal_objects_mode)
 $(proto_generated_cc_sources): PRIVATE_ARM_CFLAGS := $(normal_objects_cflags)
-$(proto_generated_objects): $(proto_generated_cc_sources_dir)/%.o: $(proto_generated_cc_sources_dir)/%.cc
+$(proto_generated_objects): $(proto_generated_cc_sources_dir)/%.o: $(proto_generated_cc_sources_dir)/%.cc $(proto_generated_headers)
 	$(transform-$(PRIVATE_HOST)cpp-to-o)
 -include $(proto_generated_objects:%.o=%.P)
 
diff --git a/core/user_tags.mk b/core/user_tags.mk
index 325c600..4c0710f 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -416,9 +416,6 @@
 	oauth \
 	obbtool \
 	omx_tests \
-	org.eclipse.core.commands_3.4.0.I20080509-2000 \
-	org.eclipse.equinox.common_3.4.0.v20080421-2006 \
-	org.eclipse.jface_3.4.2.M20090107-0800 \
 	org-netbeans-api-visual \
 	org-openide-util \
 	osgi \
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 5059950..6bd685c 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -110,9 +110,9 @@
 	jcommon-1.0.12 \
 	jfreechart-1.0.9 \
 	jfreechart-1.0.9-swt \
-	org.eclipse.core.commands_3.4.0.I20080509-2000 \
-	org.eclipse.equinox.common_3.4.0.v20080421-2006 \
-	org.eclipse.jface_3.4.2.M20090107-0800 \
+	org.eclipse.core.commands_3.6.0.I20100512-1500 \
+	org.eclipse.equinox.common_3.6.0.v20100503 \
+	org.eclipse.jface_3.6.2.M20110210-1200 \
 	osgi \
 	layoutlib \
 	lint \