diff --git a/build/annotationProcessors/CodeGenerator.java b/build/annotationProcessors/CodeGenerator.java
index 055d946e5e07..cb28e6fc4729 100644
--- a/build/annotationProcessors/CodeGenerator.java
+++ b/build/annotationProcessors/CodeGenerator.java
@@ -209,7 +209,7 @@ public class CodeGenerator {
 
     public void generateConstructor(AnnotatableEntity aCtorTuple) {
         // Unpack the tuple and extract some useful fields from the Method..
-        Constructor theCtor = aCtorTuple.getConstructor();
+        Constructor<?> theCtor = aCtorTuple.getConstructor();
         String CMethodName = mCClassName;
 
         generateMemberCommon(theCtor, mCClassName, mClassToWrap);
@@ -295,7 +295,7 @@ public class CodeGenerator {
         }
 
         Method m;
-        Constructor c;
+        Constructor<?> c;
 
         Class<?> returnType;
 
@@ -305,7 +305,7 @@ public class CodeGenerator {
             returnType = m.getReturnType();
             localReferencesNeeded = Utils.enumerateReferenceArguments(m.getParameterTypes());
         } else {
-            c = (Constructor) aMethod;
+            c = (Constructor<?>) aMethod;
             returnType = Void.class;
             localReferencesNeeded = Utils.enumerateReferenceArguments(c.getParameterTypes());
         }
@@ -371,7 +371,7 @@ public class CodeGenerator {
         return argumentContent;
     }
 
-    private void writeCtorBody(String implementationSignature, Constructor theCtor,
+    private void writeCtorBody(String implementationSignature, Constructor<?> theCtor,
             boolean aIsThreaded, boolean aNoThrow) {
         Class<?>[] argumentTypes = theCtor.getParameterTypes();
 
diff --git a/build/annotationProcessors/classloader/AnnotatableEntity.java b/build/annotationProcessors/classloader/AnnotatableEntity.java
index fcb9595b193e..9dffe6033bed 100644
--- a/build/annotationProcessors/classloader/AnnotatableEntity.java
+++ b/build/annotationProcessors/classloader/AnnotatableEntity.java
@@ -48,10 +48,10 @@ public class AnnotatableEntity {
         }
         return (Field) mMember;
     }
-    public Constructor getConstructor() {
+    public Constructor<?> getConstructor() {
         if (mEntityType != ENTITY_TYPE.CONSTRUCTOR) {
             throw new UnsupportedOperationException("Attempt to cast to unsupported member type.");
         }
-        return (Constructor) mMember;
+        return (Constructor<?>) mMember;
     }
 }
diff --git a/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java b/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
index f280d4583f01..823eb04e1eea 100644
--- a/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
+++ b/build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
@@ -63,7 +63,7 @@ public class AlphabeticAnnotatableEntityComparator<T extends Member> implements
         return lName.compareTo(rName);
     }
 
-    private static int compare(Constructor aLhs, Constructor aRhs) {
+    private static int compare(Constructor<?> aLhs, Constructor<?> aRhs) {
         // The names will be the same, so we need to compare signatures to find their uniqueness..
         String lName = Utils.getTypeSignatureString(aLhs);
         String rName = Utils.getTypeSignatureString(aRhs);
diff --git a/build/annotationProcessors/utils/GeneratableElementIterator.java b/build/annotationProcessors/utils/GeneratableElementIterator.java
index 42cc643f10d4..6e7b1349fbb1 100644
--- a/build/annotationProcessors/utils/GeneratableElementIterator.java
+++ b/build/annotationProcessors/utils/GeneratableElementIterator.java
@@ -44,7 +44,7 @@ public class GeneratableElementIterator implements Iterator<AnnotatableEntity> {
         System.arraycopy(aCtors, 0, objs, offset, aCtors.length);
 
         // Sort the elements to ensure determinism.
-        Arrays.sort(objs, new AlphabeticAnnotatableEntityComparator());
+        Arrays.sort(objs, new AlphabeticAnnotatableEntityComparator<Member>());
         mObjects = objs;
 
         // Check for "Wrap ALL the things" flag.
diff --git a/build/annotationProcessors/utils/Utils.java b/build/annotationProcessors/utils/Utils.java
index 081f88424641..f13ae66e1461 100644
--- a/build/annotationProcessors/utils/Utils.java
+++ b/build/annotationProcessors/utils/Utils.java
@@ -303,7 +303,7 @@ public class Utils {
      * @param aConstructor The Constructor to generate a signature for.
      * @return The canonical JNI type signature for this method.
      */
-    protected static String getTypeSignatureStringForConstructor(Constructor aConstructor) {
+    protected static String getTypeSignatureStringForConstructor(Constructor<?> aConstructor) {
         Class<?>[] arguments = aConstructor.getParameterTypes();
         return getTypeSignatureInternal(arguments, Void.class);
     }
@@ -314,11 +314,11 @@ public class Utils {
         } else if (aMember instanceof Field) {
             return getTypeSignatureStringForField((Field) aMember);
         } else {
-            return getTypeSignatureStringForConstructor((Constructor) aMember);
+            return getTypeSignatureStringForConstructor((Constructor<?>) aMember);
         }
     }
 
-    public static String getTypeSignatureString(Constructor aConstructor) {
+    public static String getTypeSignatureString(Constructor<?> aConstructor) {
         Class<?>[] arguments = aConstructor.getParameterTypes();
         StringBuilder sb = new StringBuilder();
         sb.append('(');