diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/APKExpansionPolicy.java b/platform/android/java/lib/src/com/google/android/vending/licensing/APKExpansionPolicy.java
index 5c9d97f8d..37fad8926 100644
--- a/platform/android/java/lib/src/com/google/android/vending/licensing/APKExpansionPolicy.java
+++ b/platform/android/java/lib/src/com/google/android/vending/licensing/APKExpansionPolicy.java
@@ -146,7 +146,7 @@ public class APKExpansionPolicy implements Policy {
             // Reset the licensing URL since it is only applicable for NOT_LICENSED responses.
             setLicensingUrl(null);
             setValidityTimestamp(Long.toString(System.currentTimeMillis() + MILLIS_PER_MINUTE));
-            RBSet<String> keys = extras.keySet();
+            Set<String> keys = extras.keySet();
             for (String key : keys) {
                 if (key.equals("VT")) {
                     setValidityTimestamp(extras.get(key));
diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseChecker.java b/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseChecker.java
index 5ae9bb5df..15017b342 100644
--- a/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseChecker.java
+++ b/platform/android/java/lib/src/com/google/android/vending/licensing/LicenseChecker.java
@@ -80,7 +80,7 @@ public class LicenseChecker implements ServiceConnection {
     private Handler mHandler;
     private final String mPackageName;
     private final String mVersionCode;
-    private final RBSet<LicenseValidator> mChecksInProgress = new HashRBSet<LicenseValidator>();
+    private final Set<LicenseValidator> mChecksInProgress = new HashSet<LicenseValidator>();
     private final Queue<LicenseValidator> mPendingChecks = new LinkedList<LicenseValidator>();
 
     /**
diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Dictionary.java b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Dictionary.java
index 39f97fdfe..931d0f03b 100644
--- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Dictionary.java
+++ b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/Dictionary.java
@@ -39,7 +39,7 @@ public class Dictionary extends HashMap<String, Object> {
 	public String[] get_keys() {
 		String[] ret = new String[size()];
 		int i = 0;
-		RBSet<String> keys = keySet();
+		Set<String> keys = keySet();
 		for (String key : keys) {
 			ret[i] = key;
 			i++;
@@ -51,7 +51,7 @@ public class Dictionary extends HashMap<String, Object> {
 	public Object[] get_values() {
 		Object[] ret = new Object[size()];
 		int i = 0;
-		RBSet<String> keys = keySet();
+		Set<String> keys = keySet();
 		for (String key : keys) {
 			ret[i] = get(key);
 			i++;
diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumInputHandler.java b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumInputHandler.java
index d5ed11dd3..61c7437ae 100644
--- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumInputHandler.java
+++ b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/input/PandemoniumInputHandler.java
@@ -306,7 +306,7 @@ public class PandemoniumInputHandler implements InputManager.InputDeviceListener
 		//Helps with creating new joypad mappings.
 		Log.i(TAG, "=== New Input Device: " + joystick.name);
 
-		RBSet<Integer> already = new HashRBSet<>();
+		Set<Integer> already = new HashSet<>();
 		for (InputDevice.MotionRange range : device.getMotionRanges()) {
 			boolean isJoystick = range.isFromSource(InputDevice.SOURCE_JOYSTICK);
 			boolean isGamepad = range.isFromSource(InputDevice.SOURCE_GAMEPAD);
diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPlugin.java b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPlugin.java
index 0b4fe86d2..66afdb2ef 100644
--- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPlugin.java
+++ b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPlugin.java
@@ -130,11 +130,11 @@ public abstract class PandemoniumPlugin {
 	}
 
 	private static Map<String, SignalInfo> registerPluginWithPandemoniumNative(Object pluginObject,
-			String pluginName, List<String> pluginMethods, RBSet<SignalInfo> pluginSignals,
-			RBSet<String> pluginGDNativeLibrariesPaths) {
+			String pluginName, List<String> pluginMethods, Set<SignalInfo> pluginSignals,
+			Set<String> pluginGDNativeLibrariesPaths) {
 		nativeRegisterSingleton(pluginName, pluginObject);
 
-		RBSet<Method> filteredMethods = new HashRBSet<>();
+		Set<Method> filteredMethods = new HashSet<>();
 		Class<?> clazz = pluginObject.getClass();
 
 		Method[] methods = clazz.getDeclaredMethods();
@@ -282,7 +282,7 @@ public abstract class PandemoniumPlugin {
 	 * Returns the list of signals to be exposed to Pandemonium.
 	 */
 	@NonNull
-	public RBSet<SignalInfo> getPluginSignals() {
+	public Set<SignalInfo> getPluginSignals() {
 		return Collections.emptySet();
 	}
 
@@ -292,7 +292,7 @@ public abstract class PandemoniumPlugin {
 	 * The paths must be relative to the 'assets' directory and point to a '*.gdnlib' file.
 	 */
 	@NonNull
-	protected RBSet<String> getPluginGDNativeLibrariesPaths() {
+	protected Set<String> getPluginGDNativeLibrariesPaths() {
 		return Collections.emptySet();
 	}
 
diff --git a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginInfoProvider.java b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginInfoProvider.java
index 0b72310ac..e3728385d 100644
--- a/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginInfoProvider.java
+++ b/platform/android/java/lib/src/net/relintai/pandemonium/pandemonium/plugin/PandemoniumPluginInfoProvider.java
@@ -49,7 +49,7 @@ public interface PandemoniumPluginInfoProvider {
 	 * Returns the list of signals to be exposed to Pandemonium.
 	 */
 	@NonNull
-	default RBSet<SignalInfo> getPluginSignals() {
+	default Set<SignalInfo> getPluginSignals() {
 		return Collections.emptySet();
 	}
 
@@ -59,7 +59,7 @@ public interface PandemoniumPluginInfoProvider {
 	 * The paths must be relative to the 'assets' directory and point to a '*.gdnlib' file.
 	 */
 	@NonNull
-	default RBSet<String> getPluginGDNativeLibrariesPaths() {
+	default Set<String> getPluginGDNativeLibrariesPaths() {
 		return Collections.emptySet();
 	}