--- Top/csound.c.orig	2017-07-12 14:54:27.000000000 +0200
+++ Top/csound.c	2017-07-17 17:27:27.064603813 +0200
@@ -1089,7 +1089,7 @@
 
 static void signal_handler(int sig)
 {
-#if defined(LINUX) && !defined(ANDROID) && !defined(NACL)
+#if defined(__GLIBC__)
     #include <execinfo.h>
 
     {
--- Opcodes/linuxjoystick.c	2018-05-10 10:31:20.000000000 +0200
+++ Opcodes/linuxjoystick.c	2018-05-13 10:47:51.360535568 +0200
@@ -36,7 +36,7 @@
 */
 
 #include "linuxjoystick.h"
-#include <sys/errno.h>
+#include <errno.h>
 
 static int32_t linuxjoystick (CSOUND *csound, LINUXJOYSTICK *stick)
 {