DOSVAXJ3-fix.patch

diff --git a/include/dos_system.h b/include/dos_system.h
index 96cbdd8..23b7134 100644
--- a/include/dos_system.h
+++ b/include/dos_system.h
@@ -22,6 +22,7 @@
 #ifndef DOSBOX_DOS_SYSTEM_H
 #define DOSBOX_DOS_SYSTEM_H
 
+#include <cstdint>
 #include <vector>
 #ifndef DOSBOX_DOSBOX_H
 #include "dosbox.h"
diff --git a/src/dos/drive_local.cpp b/src/dos/drive_local.cpp
index 3e8e762..a82a71f 100644
--- a/src/dos/drive_local.cpp
+++ b/src/dos/drive_local.cpp
@@ -28,6 +28,7 @@
 #ifndef WIN32
 #include <utime.h>
 #include <sys/file.h>
+#include <fcntl.h>
 #else
 #include <fcntl.h>
 #include <sys/utime.h>

SDL-IM-fix.patch

diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c
index fa56a99..e54318e 100644
--- a/src/stdlib/SDL_iconv.c
+++ b/src/stdlib/SDL_iconv.c
@@ -33,7 +33,7 @@
    If we get this wrong, it's just a warning, so no big deal.
 */
 #if defined(_XGP6) || \
-    defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2))
+    defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) || !defined(__USE_GNU)
 #define ICONV_INBUF_NONCONST
 #endif
 
diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c
index a10d46c..e2bbceb 100644
--- a/src/video/x11/SDL_x11video.c
+++ b/src/video/x11/SDL_x11video.c
@@ -1982,7 +1982,7 @@ int xim_init(_THIS)
 		return 0;
 	}
 
-	if (XRegisterIMInstantiateCallback(SDL_Display, NULL, NULL, NULL, (XIMProc)im_callback, NULL) != True) {
+	if (XRegisterIMInstantiateCallback(SDL_Display, NULL, NULL, NULL, (XIDProc)im_callback, NULL) != True) {
 		SDL_SetError("XRegisterIMInstantiateCallback false.");
 #ifdef DEBUG_XEVENTS
 		printf("XRegisterIMInstantiateCallback false.\n");