diff --git a/project/jni/application/alienblaster/geometry.h b/project/jni/application/alienblaster/geometry.h
index 7f1556acb..ea1f1b8c2 100644
--- a/project/jni/application/alienblaster/geometry.h
+++ b/project/jni/application/alienblaster/geometry.h
@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GEOMETRY_HH
 
 #include <math.h>         // needed for M_PI constant
+#include <vector>         // To fix include dependencies
 #include <iostream>
 using namespace std;
 
diff --git a/project/jni/application/src b/project/jni/application/src
index 59d41f41e..4de17cd97 120000
--- a/project/jni/application/src
+++ b/project/jni/application/src
@@ -1 +1 @@
-fheroes2
\ No newline at end of file
+alienblaster
\ No newline at end of file
diff --git a/project/jni/sdl-1.3/include/SDL_platform.h b/project/jni/sdl-1.3/include/SDL_platform.h
index 90eed561c..2e57241cb 100644
--- a/project/jni/sdl-1.3/include/SDL_platform.h
+++ b/project/jni/sdl-1.3/include/SDL_platform.h
@@ -65,11 +65,14 @@
 #undef __LINUX__
 #define __LINUX__	1
 #endif
+/* Hack, do not enable this */
+/*
 #if defined(ANDROID)
 #undef __ANDROID__
-#undef __LINUX__ /*do we need to do this?*/
+#undef __LINUX__
 #define __ANDROID__ 1
 #endif
+*/
 
 #if defined(__APPLE__)
 /* lets us know what version of Mac OS X we're compiling on */
diff --git a/project/jni/sdl-1.3/include/SDL_stdinc.h b/project/jni/sdl-1.3/include/SDL_stdinc.h
index 92b392b50..2bda655e2 100644
--- a/project/jni/sdl-1.3/include/SDL_stdinc.h
+++ b/project/jni/sdl-1.3/include/SDL_stdinc.h
@@ -174,7 +174,7 @@ SDL_COMPILE_TIME_ASSERT(uint16, sizeof(Uint16) == 2);
 SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2);
 SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4);
 SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4);
-#if !defined(__NINTENDODS__) && !defined(__ANDROID__)
+#if !defined(__NINTENDODS__) && !defined(ANDROID)
 /* TODO: figure out why the following happens:
  include/SDL_stdinc.h:150: error: size of array 'SDL_dummy_uint64' is negative
  include/SDL_stdinc.h:151: error: size of array 'SDL_dummy_sint64' is negative */
@@ -196,7 +196,7 @@ SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8);
 
 /** \cond */
 #ifndef DOXYGEN_SHOULD_IGNORE_THIS
-#if !defined(__NINTENDODS__) && !defined(__ANDROID__) 
+#if !defined(__NINTENDODS__) && !defined(ANDROID)
    /* TODO: include/SDL_stdinc.h:174: error: size of array 'SDL_dummy_enum' is negative */
 typedef enum
 {
diff --git a/project/jni/stlport/stlport/stl/config/_android.h b/project/jni/stlport/stlport/stl/config/_android.h
index 6acb89162..b95ec317a 100644
--- a/project/jni/stlport/stlport/stl/config/_android.h
+++ b/project/jni/stlport/stlport/stl/config/_android.h
@@ -70,9 +70,11 @@
 #if defined(__ANDROID__) /* NDK r5 */
 #  define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../../../cxx-stl/system/include
 #  define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH ../../../cxx-stl/system/include
+//#  warning ("Detected Android NDK r5 or newer")
 #else /* NDK r4b */
 #  define _STLP_NATIVE_CPP_C_INCLUDE_PATH ../../usr/include
 #  define _STLP_NATIVE_CPP_RUNTIME_INCLUDE_PATH ../../usr/include
+//#  warning ("Detected Android NDK r4b")
 #endif
 
 #ifdef __cplusplus