diff --git a/.gitignore b/.gitignore
index 1ab87fbc9..a746abbc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ build
 gen
 Build
 buildbot
-/VERSION
+/VERSION.txt
 
 *.so
 *.so.*
diff --git a/Android.mk b/Android.mk
index facc54afb..06146cd40 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,7 +12,7 @@ LOCAL_MODULE := SDL2
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)/include
 
 LOCAL_SRC_FILES := \
 	$(subst $(LOCAL_PATH)/,, \
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf0c5e9ea..ffd9de7ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2960,8 +2960,8 @@ set(EXTRA_CFLAGS ${_EXTRA_CFLAGS})
 
 # Compat helpers for the configuration files
 
-if(EXISTS "${PROJECT_SOURCE_DIR}/VERSION")
-  file(READ "${PROJECT_SOURCE_DIR}/VERSION" SDL_SOURCE_VERSION)
+if(EXISTS "${PROJECT_SOURCE_DIR}/VERSION.txt")
+  file(READ "${PROJECT_SOURCE_DIR}/VERSION.txt" SDL_SOURCE_VERSION)
   string(STRIP "${SDL_SOURCE_VERSION}" SDL_SOURCE_VERSION)
 endif()
 
diff --git a/build-scripts/showrev.sh b/build-scripts/showrev.sh
index 02cbbb0c6..a061df423 100755
--- a/build-scripts/showrev.sh
+++ b/build-scripts/showrev.sh
@@ -5,8 +5,8 @@
 SDL_ROOT=$(dirname $0)/..
 cd $SDL_ROOT
 
-if [ -e ./VERSION ]; then
-    cat ./VERSION
+if [ -e ./VERSION.txt ]; then
+    cat ./VERSION.txt
     exit 0
 fi
 
diff --git a/build-scripts/updaterev.sh b/build-scripts/updaterev.sh
index 3ab034fd5..cc8638210 100755
--- a/build-scripts/updaterev.sh
+++ b/build-scripts/updaterev.sh
@@ -29,7 +29,7 @@ done
 rev=`sh showrev.sh 2>/dev/null`
 if [ "$rev" != "" ]; then
     if [ -n "$dist" ]; then
-        echo "$rev" > "$outdir/VERSION"
+        echo "$rev" > "$outdir/VERSION.txt"
     fi
     echo "/* Generated by updaterev.sh, do not edit */" >"$header.new"
     if [ -n "$vendor" ]; then