diff --git a/mobile/android/base/GeckoAccessibility.java b/mobile/android/base/GeckoAccessibility.java
index c141cd803f10..eb7389e6c932 100644
--- a/mobile/android/base/GeckoAccessibility.java
+++ b/mobile/android/base/GeckoAccessibility.java
@@ -8,7 +8,8 @@ package org.mozilla.gecko;
 import org.mozilla.gecko.gfx.LayerView;
 import org.mozilla.gecko.util.ThreadUtils;
 
-import org.json.*;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningServiceInfo;
@@ -18,7 +19,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.view.accessibility.*;
+import android.view.accessibility.AccessibilityEvent;
+import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityNodeProvider;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/mobile/android/base/GeckoUpdateReceiver.java b/mobile/android/base/GeckoUpdateReceiver.java
index 5c55d93afc25..94ac41e9548f 100644
--- a/mobile/android/base/GeckoUpdateReceiver.java
+++ b/mobile/android/base/GeckoUpdateReceiver.java
@@ -7,10 +7,11 @@ package org.mozilla.gecko;
 
 import org.mozilla.gecko.updater.UpdateServiceHelper;
 
-import android.content.*;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
 
-public class GeckoUpdateReceiver
-    extends BroadcastReceiver
+public class GeckoUpdateReceiver extends BroadcastReceiver
 {
     @Override
     public void onReceive(Context context, Intent intent) {