diff --git a/README.md b/README.md
index 5dfaafd..d391fcd 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ It is also possible build the dll yourself. You can find more infos at [raylib's
 * `opengl11` - uses OpenGL 1.1 backend (pseudo OpenGL 1.1 style)
 * `es2` - uses OpenGL ES 2.0 backend (can be used to link against [Google's ANGLE](https://github.com/google/angle))
 * `es3` - experimental support for OpenGL ES 3.0
+* `x11` - force X11 compatibility mode on Wayland
 
 ### Documentation
 
diff --git a/examples/others/android/example/README.md b/examples/others/android/example/README.md
index 98468ce..6ef631d 100644
--- a/examples/others/android/example/README.md
+++ b/examples/others/android/example/README.md
@@ -33,16 +33,11 @@ To build apk export path to Android SDK, point to location where you unpacked ar
 
     export ANDROID_HOME=/opt/android-sdk
 
-And build apk with ant:
-
-    cd android
-    ant clean debug
-
-Or with gradle:
+And build apk:
 
     ./gradlew assembleDebug
 
-If everything is successfully built apk can be found in bin/ directory or in the android/build/outputs in case `gradle` is used.
+If everything is successfully built apk can be found in the android/build/outputs.
 
 
 For aarch64/arm64 replace `arm-linux-androideabi` with `aarch64-linux-android`, set GOARCH to arm64 and use minimum `ANDROID_API=21`.
diff --git a/examples/others/android/example/android/AndroidManifest.xml b/examples/others/android/example/android/AndroidManifest.xml
index 20cc5cf..19b1694 100644
--- a/examples/others/android/example/android/AndroidManifest.xml
+++ b/examples/others/android/example/android/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-        package="com.github.gen2brain.raylib.go" 
         android:versionCode="1" 
         android:versionName="1.0">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="34" />
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
     <!-- We do not have Java code. Therefore android:hasCode is set to false. -->
@@ -15,6 +14,7 @@
 
         <!-- Our activity is the built-in NativeActivity framework class. -->
         <activity android:name="android.app.NativeActivity"
+                android:exported="true"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:screenOrientation="landscape"
                 android:clearTaskOnLaunch="true">
diff --git a/examples/others/android/example/android/build.gradle b/examples/others/android/example/android/build.gradle
index 3bb73a0..b819fb4 100644
--- a/examples/others/android/example/android/build.gradle
+++ b/examples/others/android/example/android/build.gradle
@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    namespace = "com.example.android"
+    compileSdkVersion 34
+    buildToolsVersion '34.0.0'
 
     defaultConfig {
         applicationId "com.example.android"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 34
         versionCode 1
         versionName '1.0'
     }
diff --git a/examples/others/android/example/android/build.xml b/examples/others/android/example/android/build.xml
deleted file mode 100644
index 3e7a699..0000000
--- a/examples/others/android/example/android/build.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="example" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- if sdk.dir was not set from one of the property file, then
-         get it from the ANDROID_HOME env var.
-         This must be done before we load project.properties since
-         the proguard config can use sdk.dir -->
-    <property environment="env" />
-    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
-        <isset property="env.ANDROID_HOME" />
-    </condition>
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/examples/others/android/example/android/project.properties b/examples/others/android/example/android/project.properties
deleted file mode 100644
index 36b004b..0000000
--- a/examples/others/android/example/android/project.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Project target.
-target=android-27
diff --git a/examples/others/android/example/build.gradle b/examples/others/android/example/build.gradle
index e9f7a57..301e2dd 100644
--- a/examples/others/android/example/build.gradle
+++ b/examples/others/android/example/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 
diff --git a/examples/others/android/example/gradle/wrapper/gradle-wrapper.properties b/examples/others/android/example/gradle/wrapper/gradle-wrapper.properties
index 9f7ad18..b05c5cc 100644
--- a/examples/others/android/example/gradle/wrapper/gradle-wrapper.properties
+++ b/examples/others/android/example/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
diff --git a/raylib/cgo_linux.go b/raylib/cgo_linux.go
index cfaabaf..9c8a507 100644
--- a/raylib/cgo_linux.go
+++ b/raylib/cgo_linux.go
@@ -34,9 +34,12 @@ GLFWbool _glfwConnectNull(int platformID, _GLFWplatform* platform) {
 	return GLFW_TRUE;
 }
 
-#cgo linux CFLAGS: -Iexternal/glfw/include -DPLATFORM_DESKTOP -D_GLFW_WAYLAND -D_GLFW_X11 -Wno-stringop-overflow
+#cgo linux CFLAGS: -Iexternal/glfw/include -DPLATFORM_DESKTOP -Wno-stringop-overflow
 #cgo linux LDFLAGS: -lm -pthread -ldl -lrt -lwayland-client -lwayland-cursor -lwayland-egl -lxkbcommon
 
+#cgo linux,x11 CFLAGS: -D_GLFW_X11
+#cgo linux,!x11 CFLAGS: -D_GLFW_X11 -D_GLFW_WAYLAND
+
 #cgo linux,!es2,!es3 LDFLAGS: -lGL
 
 #cgo linux,opengl11,!es2,!es3 CFLAGS: -DGRAPHICS_API_OPENGL_11
diff --git a/raylib/platform_android.go b/raylib/platform_android.go
index 3d6d3f8..e80c8bc 100644
--- a/raylib/platform_android.go
+++ b/raylib/platform_android.go
@@ -11,8 +11,8 @@ package rl
 
 extern void android_init();
 
-extern AAssetManager* asset_manager;
-extern const char* internal_storage_path;
+static AAssetManager* asset_manager;
+static const char* internal_storage_path;
 */
 import "C"