diff --git a/Android/.gitignore b/Android/.gitignore
index 0ca033221..7da466be0 100644
--- a/Android/.gitignore
+++ b/Android/.gitignore
@@ -7,6 +7,8 @@ obj/
 *.d
 *.o
 *.so
+Version.h.in
+
 # Eclipse project files
 .settings/
 .classpath
diff --git a/Android/jni/Project64-core/Project64-core.mk b/Android/jni/Project64-core/Project64-core.mk
index 2c05d32a1..e416a704a 100644
--- a/Android/jni/Project64-core/Project64-core.mk
+++ b/Android/jni/Project64-core/Project64-core.mk
@@ -17,10 +17,10 @@ LOCAL_C_INCLUDES := ../     \
 LOCAL_SRC_FILES :=                                                     \
     $(SRCDIR)/AppInit.cpp                                              \
     $(SRCDIR)/logging.cpp                                              \
+    $(SRCDIR)/Settings.cpp                                             \
     $(SRCDIR)/MemoryExceptionFilter.cpp                                \
     $(SRCDIR)/Multilanguage/LanguageClass.cpp                          \
     $(SRCDIR)/Settings/LoggingSettings.cpp                             \
-    $(SRCDIR)/Settings/SettingsClass.cpp                               \
     $(SRCDIR)/Settings/RecompilerSettings.cpp                          \
     $(SRCDIR)/N64System/Interpreter/InterpreterCPU.cpp                 \
     $(SRCDIR)/N64System/Interpreter/InterpreterOps.cpp                 \