diff --git a/android/phoenix/src/org/retroarch/browser/ConfigFile.java b/android/phoenix/src/org/retroarch/browser/ConfigFile.java
index 2aec2b2859..7aed60a60a 100644
--- a/android/phoenix/src/org/retroarch/browser/ConfigFile.java
+++ b/android/phoenix/src/org/retroarch/browser/ConfigFile.java
@@ -10,7 +10,7 @@ import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ConfigFile {
+public final class ConfigFile {
 	private HashMap<String, String> map = new HashMap<String, String>();
 
 	public void append(InputStream stream) throws IOException {
diff --git a/android/phoenix/src/org/retroarch/browser/CoreSelection.java b/android/phoenix/src/org/retroarch/browser/CoreSelection.java
index fb1d2ac3d4..05519d82e4 100644
--- a/android/phoenix/src/org/retroarch/browser/CoreSelection.java
+++ b/android/phoenix/src/org/retroarch/browser/CoreSelection.java
@@ -13,7 +13,7 @@ import android.view.*;
 
 // JELLY_BEAN_MR1 = 17
 
-public class CoreSelection extends Activity implements
+public final class CoreSelection extends Activity implements
 		AdapterView.OnItemClickListener {
 	private IconAdapter<ModuleWrapper> adapter;
 	static private final String TAG = "CoreSelection";
diff --git a/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java b/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java
index 22df6cedbd..6fb10fe70d 100644
--- a/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java
+++ b/android/phoenix/src/org/retroarch/browser/DisplayRefreshRateTest.java
@@ -12,7 +12,7 @@ import android.util.Log;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-public class DisplayRefreshRateTest extends Activity {
+public final class DisplayRefreshRateTest extends Activity {
 
 	private class Renderer implements GLSurfaceView.Renderer {
 		private static final String TAG = "GLESRenderer";
diff --git a/android/phoenix/src/org/retroarch/browser/FileWrapper.java b/android/phoenix/src/org/retroarch/browser/FileWrapper.java
index afbd0fbd54..08584343eb 100644
--- a/android/phoenix/src/org/retroarch/browser/FileWrapper.java
+++ b/android/phoenix/src/org/retroarch/browser/FileWrapper.java
@@ -6,7 +6,7 @@ import org.retroarch.R;
 
 import android.graphics.drawable.Drawable;
 
-class FileWrapper implements IconAdapterItem {
+final class FileWrapper implements IconAdapterItem {
 	public final File file;
 	public final boolean parentItem;
 	public final boolean dirSelectItem;
diff --git a/android/phoenix/src/org/retroarch/browser/HelpActivity.java b/android/phoenix/src/org/retroarch/browser/HelpActivity.java
index ea1e113b79..2248d92ce4 100644
--- a/android/phoenix/src/org/retroarch/browser/HelpActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/HelpActivity.java
@@ -6,7 +6,7 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 
-public class HelpActivity extends PreferenceActivity {
+public final class HelpActivity extends PreferenceActivity {
 	@SuppressWarnings("deprecation")
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
diff --git a/android/phoenix/src/org/retroarch/browser/HistorySelection.java b/android/phoenix/src/org/retroarch/browser/HistorySelection.java
index f35b32c26d..b79b92c6e1 100644
--- a/android/phoenix/src/org/retroarch/browser/HistorySelection.java
+++ b/android/phoenix/src/org/retroarch/browser/HistorySelection.java
@@ -17,7 +17,7 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.Toast;
 
-public class HistorySelection extends Activity implements
+public final class HistorySelection extends Activity implements
 		AdapterView.OnItemClickListener {
 	
 	private IconAdapter<HistoryWrapper> adapter;
diff --git a/android/phoenix/src/org/retroarch/browser/HistoryWrapper.java b/android/phoenix/src/org/retroarch/browser/HistoryWrapper.java
index ae57f1c149..977802398d 100644
--- a/android/phoenix/src/org/retroarch/browser/HistoryWrapper.java
+++ b/android/phoenix/src/org/retroarch/browser/HistoryWrapper.java
@@ -4,7 +4,7 @@ import java.io.File;
 
 import android.graphics.drawable.Drawable;
 
-public class HistoryWrapper implements IconAdapterItem {
+public final class HistoryWrapper implements IconAdapterItem {
 	
 	private String gamePath;
 	private String gamePathShort;
diff --git a/android/phoenix/src/org/retroarch/browser/IMEActivity.java b/android/phoenix/src/org/retroarch/browser/IMEActivity.java
index cfe1f55cd4..5525f14720 100644
--- a/android/phoenix/src/org/retroarch/browser/IMEActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/IMEActivity.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.view.inputmethod.InputMethodManager;
 
-public class IMEActivity extends Activity {
+public final class IMEActivity extends Activity {
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/android/phoenix/src/org/retroarch/browser/IconAdapter.java b/android/phoenix/src/org/retroarch/browser/IconAdapter.java
index 5d1a2c9f64..c70f0f9e22 100644
--- a/android/phoenix/src/org/retroarch/browser/IconAdapter.java
+++ b/android/phoenix/src/org/retroarch/browser/IconAdapter.java
@@ -16,7 +16,7 @@ interface IconAdapterItem {
 	public abstract Drawable getIconDrawable();
 }
 
-class IconAdapter<T extends IconAdapterItem> extends ArrayAdapter<T> {
+final class IconAdapter<T extends IconAdapterItem> extends ArrayAdapter<T> {
 	private final int layout;
 
 	public IconAdapter(Activity aContext, int aLayout) {
diff --git a/android/phoenix/src/org/retroarch/browser/KeyBindPreference.java b/android/phoenix/src/org/retroarch/browser/KeyBindPreference.java
index a50efc226a..a9a51fd5b8 100644
--- a/android/phoenix/src/org/retroarch/browser/KeyBindPreference.java
+++ b/android/phoenix/src/org/retroarch/browser/KeyBindPreference.java
@@ -14,7 +14,7 @@ import android.widget.EditText;
 import android.widget.ListView;
 import org.retroarch.R;
 
-class KeyBindEditText extends EditText
+final class KeyBindEditText extends EditText
 {
 	KeyBindPreference pref;
 	public KeyBindEditText(Context context, AttributeSet attrs) {
@@ -39,7 +39,7 @@ class KeyBindEditText extends EditText
 	}
 }
 
-class KeyBindPreference extends DialogPreference implements View.OnKeyListener, AdapterView.OnItemClickListener, LayoutInflater.Factory {
+final class KeyBindPreference extends DialogPreference implements View.OnKeyListener, AdapterView.OnItemClickListener, LayoutInflater.Factory {
 	private int key_bind_code;
 	private boolean grabKeyCode = false;
 	KeyBindEditText keyText;
diff --git a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
index 679fae917d..ff1eaffde3 100644
--- a/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/MainMenuActivity.java
@@ -28,7 +28,7 @@ import android.view.Display;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-public class MainMenuActivity extends PreferenceActivity {
+public final class MainMenuActivity extends PreferenceActivity {
 	private static MainMenuActivity instance = null;
 	static private final int ACTIVITY_LOAD_ROM = 0;
 	static private final String TAG = "MainMenu";
diff --git a/android/phoenix/src/org/retroarch/browser/ModuleWrapper.java b/android/phoenix/src/org/retroarch/browser/ModuleWrapper.java
index f029edb0cc..01f026b109 100644
--- a/android/phoenix/src/org/retroarch/browser/ModuleWrapper.java
+++ b/android/phoenix/src/org/retroarch/browser/ModuleWrapper.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 
-class ModuleWrapper implements IconAdapterItem {
+final class ModuleWrapper implements IconAdapterItem {
 	public final File file;
 	private ConfigFile config;
 
diff --git a/android/phoenix/src/org/retroarch/browser/OverlayActivity.java b/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
index 38981f6b87..f78f2abf80 100644
--- a/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/OverlayActivity.java
@@ -4,7 +4,7 @@ import java.io.File;
 
 import android.os.Bundle;
 
-public class OverlayActivity extends DirectoryActivity {
+public final class OverlayActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		File overlayDir = new File(getBaseContext().getApplicationInfo().dataDir, "overlays");
diff --git a/android/phoenix/src/org/retroarch/browser/ROMActivity.java b/android/phoenix/src/org/retroarch/browser/ROMActivity.java
index 27a9e084b2..c969ab34f5 100644
--- a/android/phoenix/src/org/retroarch/browser/ROMActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/ROMActivity.java
@@ -5,7 +5,7 @@ import java.io.File;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 
-public class ROMActivity extends DirectoryActivity {
+public final class ROMActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		
diff --git a/android/phoenix/src/org/retroarch/browser/ROMDirActivity.java b/android/phoenix/src/org/retroarch/browser/ROMDirActivity.java
index c29dfc9722..5664cdde64 100644
--- a/android/phoenix/src/org/retroarch/browser/ROMDirActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/ROMDirActivity.java
@@ -2,7 +2,7 @@ package org.retroarch.browser;
 
 import android.os.Bundle;
 
-public class ROMDirActivity extends DirectoryActivity {
+public final class ROMDirActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.setPathSettingKey("rgui_browser_directory");
diff --git a/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java b/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
index cbef30d588..9b1f09b6d4 100644
--- a/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
+++ b/android/phoenix/src/org/retroarch/browser/RefreshRateSetOS.java
@@ -8,7 +8,7 @@ import android.view.Display;
 import android.view.WindowManager;
 import android.widget.Toast;
 
-public class RefreshRateSetOS extends Activity {
+public final class RefreshRateSetOS extends Activity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
diff --git a/android/phoenix/src/org/retroarch/browser/ReportIME.java b/android/phoenix/src/org/retroarch/browser/ReportIME.java
index c8f5d463b4..e096e3c01c 100644
--- a/android/phoenix/src/org/retroarch/browser/ReportIME.java
+++ b/android/phoenix/src/org/retroarch/browser/ReportIME.java
@@ -6,7 +6,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.provider.Settings;
 
-public class ReportIME extends Activity {
+public final class ReportIME extends Activity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
diff --git a/android/phoenix/src/org/retroarch/browser/RetroActivity.java b/android/phoenix/src/org/retroarch/browser/RetroActivity.java
index 8a666d8e5c..c06b074df8 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroActivity.java
@@ -4,7 +4,7 @@ import android.app.NativeActivity;
 import android.os.Bundle;
 import android.widget.Toast;
 
-public class RetroActivity extends NativeActivity {
+public final class RetroActivity extends NativeActivity {
 	public RetroActivity() {
 		super();
 	}
diff --git a/android/phoenix/src/org/retroarch/browser/RetroTVMode.java b/android/phoenix/src/org/retroarch/browser/RetroTVMode.java
index 60e84b9998..ea4889b386 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroTVMode.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroTVMode.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.provider.Settings;
 
-public class RetroTVMode extends Activity {
+public final class RetroTVMode extends Activity {
 	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
diff --git a/android/phoenix/src/org/retroarch/browser/SRMDirActivity.java b/android/phoenix/src/org/retroarch/browser/SRMDirActivity.java
index 65c62efcdb..d56130309d 100644
--- a/android/phoenix/src/org/retroarch/browser/SRMDirActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/SRMDirActivity.java
@@ -2,7 +2,7 @@ package org.retroarch.browser;
 
 import android.os.Bundle;
 
-public class SRMDirActivity extends DirectoryActivity {
+public final class SRMDirActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.setPathSettingKey("savefile_directory");
diff --git a/android/phoenix/src/org/retroarch/browser/SeekbarPreference.java b/android/phoenix/src/org/retroarch/browser/SeekbarPreference.java
index ee90a5dcd7..a03e3b4539 100644
--- a/android/phoenix/src/org/retroarch/browser/SeekbarPreference.java
+++ b/android/phoenix/src/org/retroarch/browser/SeekbarPreference.java
@@ -10,7 +10,7 @@ import android.view.View;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-public class SeekbarPreference extends DialogPreference implements SeekBar.OnSeekBarChangeListener {
+public final class SeekbarPreference extends DialogPreference implements SeekBar.OnSeekBarChangeListener {
 	float seek_value;
 	SeekBar bar;
 	TextView text;
diff --git a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
index 3fb705de94..4bf0bd92c1 100644
--- a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java
@@ -4,7 +4,7 @@ import java.io.File;
 
 import android.os.Bundle;
 
-public class ShaderActivity extends DirectoryActivity {
+public final class ShaderActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		File shaderDir = new File(getBaseContext().getApplicationInfo().dataDir, "shaders_glsl");
diff --git a/android/phoenix/src/org/retroarch/browser/StateDirActivity.java b/android/phoenix/src/org/retroarch/browser/StateDirActivity.java
index 2f28a4cdcb..a43845ea69 100644
--- a/android/phoenix/src/org/retroarch/browser/StateDirActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/StateDirActivity.java
@@ -2,7 +2,7 @@ package org.retroarch.browser;
 
 import android.os.Bundle;
 
-public class StateDirActivity extends DirectoryActivity {
+public final class StateDirActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.setPathSettingKey("savestate_directory");
diff --git a/android/phoenix/src/org/retroarch/browser/SystemDirActivity.java b/android/phoenix/src/org/retroarch/browser/SystemDirActivity.java
index 1a2be43477..b483de0a1d 100644
--- a/android/phoenix/src/org/retroarch/browser/SystemDirActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/SystemDirActivity.java
@@ -2,7 +2,7 @@ package org.retroarch.browser;
 
 import android.os.Bundle;
 
-public class SystemDirActivity extends DirectoryActivity {
+public final class SystemDirActivity extends DirectoryActivity {
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.setPathSettingKey("system_directory");