diff --git a/app/build.gradle b/app/build.gradle
index 96d5ea0..c4756c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,7 +13,7 @@ android {
         }
     }
     compileSdkVersion 33
-    ndkVersion "25.2.9519653"
+    ndkVersion "26.1.10909125"
 
     defaultConfig {
         applicationId "org.ab.x48"
diff --git a/app/src/main/jni/main.c b/app/src/main/jni/main.c
index fdb1c90..13e105b 100644
--- a/app/src/main/jni/main.c
+++ b/app/src/main/jni/main.c
@@ -70,7 +70,8 @@
 #include <sys/time.h>
 #include <fcntl.h>
 
-#include "x48.h"
+#include "binio.h"
+#include "hp48_emu.h"
 #include "hp48.h"
 #include "debugger.h"
 
diff --git a/app/src/main/jni/x48.h b/app/src/main/jni/x48.h
index e9724ad..c19b647 100644
--- a/app/src/main/jni/x48.h
+++ b/app/src/main/jni/x48.h
@@ -177,4 +177,18 @@ extern void XCopyPlane __ProtoType__((Display *dpy, Pixmap map, Window win, GC g
 extern void XClearWindow __ProtoType__((Display *dpy, Window win));
 
 static pthread_cond_t  uiConditionVariable  = PTHREAD_COND_INITIALIZER;
-static pthread_mutex_t uiConditionMutex     = PTHREAD_MUTEX_INITIALIZER;
\ No newline at end of file
+static pthread_mutex_t uiConditionMutex     = PTHREAD_MUTEX_INITIALIZER;
+
+extern int
+#ifdef __FunctionProto__
+button_pressed(int b);
+#else
+button_pressed(b);
+#endif
+
+extern int
+#ifdef __FunctionProto__
+button_released(int b);
+#else
+button_released(b);
+#endif
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index dd64418..80d9757 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 96e736b..21d2e19 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Mar 22 21:49:54 CET 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME