Merge pull request #6 from rajdakin/generalImprovements

General improvements to box64 and fixed some SDL2 functions

40 files changed, 1371 insertions, 17 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index bdbda443..eef2095b 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -1,4 +1,3 @@
-#() iF
 #() vFE
 #() vFv
 #() vFi
@@ -102,7 +101,6 @@
 #() iFui
 #() iFuu
 #() iFup
-#() iFUU
 #() iFli
 #() iFLL
 #() iFLp
@@ -234,6 +232,7 @@
 #() iFEip
 #() iFEWW
 #() iFEup
+#() iFEUU
 #() iFEpi
 #() iFEpL
 #() iFEpp
@@ -1186,6 +1185,7 @@
 #!defined(HAVE_LD80BITS) KFK
 #!defined(HAVE_LD80BITS) KFKK
 #!defined(HAVE_LD80BITS) KFKp
+#() vFEv -> vFE
 #() lFEv -> lFE
 #() LFEv -> LFE
 #() pFEv -> pFE
diff --git a/src/wrapped/generated/wrappedbz2types.h b/src/wrapped/generated/wrappedbz2types.h
new file mode 100644
index 00000000..7ea64a63
--- /dev/null
+++ b/src/wrapped/generated/wrappedbz2types.h
@@ -0,0 +1,27 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedbz2TYPES_H_
+#define __wrappedbz2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFp_t)(void*);
+typedef int64_t (*iFpi_t)(void*, int64_t);
+typedef int64_t (*iFpii_t)(void*, int64_t, int64_t);
+typedef int64_t (*iFpiii_t)(void*, int64_t, int64_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(BZ2_bzCompressEnd, iFp_t) \
+	GO(BZ2_bzDecompress, iFp_t) \
+	GO(BZ2_bzDecompressEnd, iFp_t) \
+	GO(BZ2_bzCompress, iFpi_t) \
+	GO(BZ2_bzDecompressInit, iFpii_t) \
+	GO(BZ2_bzCompressInit, iFpiii_t)
+
+#endif // __wrappedbz2TYPES_H_
diff --git a/src/wrapped/generated/wrappedcryptotypes.h b/src/wrapped/generated/wrappedcryptotypes.h
new file mode 100644
index 00000000..30d8180f
--- /dev/null
+++ b/src/wrapped/generated/wrappedcryptotypes.h
@@ -0,0 +1,37 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedcryptoTYPES_H_
+#define __wrappedcryptoTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef int64_t (*iFpiipp_t)(void*, int64_t, int64_t, void*, void*);
+typedef int64_t (*iFppppipp_t)(void*, void*, void*, void*, int64_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(CRYPTO_set_id_callback, vFp_t) \
+	GO(CRYPTO_set_locking_callback, vFp_t) \
+	GO(sk_new, pFp_t) \
+	GO(sk_pop_free, vFpp_t) \
+	GO(PEM_read_bio_DSAPrivateKey, pFpppp_t) \
+	GO(PEM_read_bio_DSA_PUBKEY, pFpppp_t) \
+	GO(PEM_read_bio_ECPrivateKey, pFpppp_t) \
+	GO(PEM_read_bio_EC_PUBKEY, pFpppp_t) \
+	GO(PEM_read_bio_RSAPrivateKey, pFpppp_t) \
+	GO(PEM_read_bio_RSA_PUBKEY, pFpppp_t) \
+	GO(ENGINE_ctrl, iFpiipp_t) \
+	GO(PEM_write_bio_DSAPrivateKey, iFppppipp_t) \
+	GO(PEM_write_bio_ECPrivateKey, iFppppipp_t) \
+	GO(PEM_write_bio_RSAPrivateKey, iFppppipp_t)
+
+#endif // __wrappedcryptoTYPES_H_
diff --git a/src/wrapped/generated/wrappedcurltypes.h b/src/wrapped/generated/wrappedcurltypes.h
new file mode 100644
index 00000000..5f0cccfd
--- /dev/null
+++ b/src/wrapped/generated/wrappedcurltypes.h
@@ -0,0 +1,19 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedcurlTYPES_H_
+#define __wrappedcurlTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef uint64_t (*uFpup_t)(void*, uint64_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(curl_easy_setopt, uFpup_t)
+
+#endif // __wrappedcurlTYPES_H_
diff --git a/src/wrapped/generated/wrappeddbustypes.h b/src/wrapped/generated/wrappeddbustypes.h
new file mode 100644
index 00000000..ea6dd689
--- /dev/null
+++ b/src/wrapped/generated/wrappeddbustypes.h
@@ -0,0 +1,39 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappeddbusTYPES_H_
+#define __wrappeddbusTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef int64_t (*iFpipp_t)(void*, int64_t, void*, void*);
+typedef int64_t (*iFppip_t)(void*, void*, int64_t, void*);
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef int64_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+typedef int64_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(dbus_connection_remove_filter, vFppp_t) \
+	GO(dbus_timeout_set_data, vFppp_t) \
+	GO(dbus_watch_set_data, vFppp_t) \
+	GO(dbus_connection_set_dispatch_status_function, vFpppp_t) \
+	GO(dbus_connection_set_wakeup_main_function, vFpppp_t) \
+	GO(dbus_connection_set_data, iFpipp_t) \
+	GO(dbus_message_set_data, iFpipp_t) \
+	GO(dbus_pending_call_set_data, iFpipp_t) \
+	GO(dbus_message_get_args_valist, iFppip_t) \
+	GO(dbus_connection_add_filter, iFpppp_t) \
+	GO(dbus_pending_call_set_notify, iFpppp_t) \
+	GO(dbus_connection_try_register_fallback, iFppppp_t) \
+	GO(dbus_connection_try_register_object_path, iFppppp_t) \
+	GO(dbus_connection_set_timeout_functions, iFpppppp_t) \
+	GO(dbus_connection_set_watch_functions, iFpppppp_t)
+
+#endif // __wrappeddbusTYPES_H_
diff --git a/src/wrapped/generated/wrappedfontconfigtypes.h b/src/wrapped/generated/wrappedfontconfigtypes.h
new file mode 100644
index 00000000..46e77c3f
--- /dev/null
+++ b/src/wrapped/generated/wrappedfontconfigtypes.h
@@ -0,0 +1,19 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedfontconfigTYPES_H_
+#define __wrappedfontconfigTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFppiLi_t)(void*, void*, int64_t, uintptr_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(FcPatternAddWeak, iFppiLi_t)
+
+#endif // __wrappedfontconfigTYPES_H_
diff --git a/src/wrapped/generated/wrappedfreetypetypes.h b/src/wrapped/generated/wrappedfreetypetypes.h
new file mode 100644
index 00000000..9378eb8f
--- /dev/null
+++ b/src/wrapped/generated/wrappedfreetypetypes.h
@@ -0,0 +1,21 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedfreetypeTYPES_H_
+#define __wrappedfreetypeTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFpplp_t)(void*, void*, intptr_t, void*);
+typedef int64_t (*iFpuuLppp_t)(void*, uint64_t, uint64_t, uintptr_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(FT_Open_Face, iFpplp_t) \
+	GO(FTC_Manager_New, iFpuuLppp_t)
+
+#endif // __wrappedfreetypeTYPES_H_
diff --git a/src/wrapped/generated/wrappedgnutlstypes.h b/src/wrapped/generated/wrappedgnutlstypes.h
new file mode 100644
index 00000000..d465739c
--- /dev/null
+++ b/src/wrapped/generated/wrappedgnutlstypes.h
@@ -0,0 +1,22 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedgnutlsTYPES_H_
+#define __wrappedgnutlsTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gnutls_global_set_log_function, vFp_t) \
+	GO(gnutls_transport_set_pull_function, vFpp_t) \
+	GO(gnutls_transport_set_push_function, vFpp_t)
+
+#endif // __wrappedgnutlsTYPES_H_
diff --git a/src/wrapped/generated/wrappedldlinuxtypes.h b/src/wrapped/generated/wrappedldlinuxtypes.h
new file mode 100644
index 00000000..4a7a4158
--- /dev/null
+++ b/src/wrapped/generated/wrappedldlinuxtypes.h
@@ -0,0 +1,19 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedldlinuxTYPES_H_
+#define __wrappedldlinuxTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(__tls_get_addr, pFp_t)
+
+#endif // __wrappedldlinuxTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibasoundtypes.h b/src/wrapped/generated/wrappedlibasoundtypes.h
new file mode 100644
index 00000000..ab06d481
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibasoundtypes.h
@@ -0,0 +1,28 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibasoundTYPES_H_
+#define __wrappedlibasoundTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFp_t)(void*);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef int64_t (*iFpipp_t)(void*, int64_t, void*, void*);
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpipL_t)(void*, int64_t, void*, uintptr_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(snd_dlclose, iFp_t) \
+	GO(snd_lib_error_set_handler, iFp_t) \
+	GO(snd_dlsym, pFppp_t) \
+	GO(snd_async_add_handler, iFpipp_t) \
+	GO(snd_async_add_pcm_handler, iFpppp_t) \
+	GO(snd_dlopen, pFpipL_t)
+
+#endif // __wrappedlibasoundTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibctypes.h b/src/wrapped/generated/wrappedlibctypes.h
new file mode 100644
index 00000000..d20ca9a3
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibctypes.h
@@ -0,0 +1,167 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibcTYPES_H_
+#define __wrappedlibcTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFv_t)(void);
+typedef void (*vFp_t)(void*);
+typedef int64_t (*iFp_t)(void*);
+typedef intptr_t (*lFv_t)(void);
+typedef uintptr_t (*LFv_t)(void);
+typedef void (*vFpi_t)(void*, int64_t);
+typedef void (*vFpu_t)(void*, uint64_t);
+typedef int64_t (*iFpi_t)(void*, int64_t);
+typedef int64_t (*iFpL_t)(void*, uintptr_t);
+typedef int64_t (*iFpp_t)(void*, void*);
+typedef int64_t (*iFpV_t)(void*, void*);
+typedef int64_t (*iFSp_t)(void*, void*);
+typedef void* (*pFip_t)(int64_t, void*);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFipV_t)(int64_t, void*, void*);
+typedef void (*vFpii_t)(void*, int64_t, int64_t);
+typedef void (*vFpup_t)(void*, uint64_t, void*);
+typedef int64_t (*iFiip_t)(int64_t, int64_t, void*);
+typedef int64_t (*iFiiN_t)(int64_t, int64_t, ...);
+typedef int64_t (*iFipp_t)(int64_t, void*, void*);
+typedef int64_t (*iFipV_t)(int64_t, void*, void*);
+typedef int64_t (*iFpLi_t)(void*, uintptr_t, int64_t);
+typedef int64_t (*iFppi_t)(void*, void*, int64_t);
+typedef int64_t (*iFppp_t)(void*, void*, void*);
+typedef int64_t (*iFppV_t)(void*, void*, void*);
+typedef int64_t (*iFpOu_t)(void*, int32_t, uint64_t);
+typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
+typedef void* (*pFpip_t)(void*, int64_t, void*);
+typedef void (*vFiipV_t)(int64_t, int64_t, void*, void*);
+typedef void (*vFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
+typedef int64_t (*iFpipp_t)(void*, int64_t, void*, void*);
+typedef int64_t (*iFpipV_t)(void*, int64_t, void*, void*);
+typedef int64_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
+typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, void*);
+typedef int64_t (*iFppii_t)(void*, void*, int64_t, int64_t);
+typedef int64_t (*iFppiV_t)(void*, void*, int64_t, void*);
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
+typedef int64_t (*iFiippi_t)(int64_t, int64_t, void*, void*, int64_t);
+typedef int64_t (*iFpilpV_t)(void*, int64_t, intptr_t, void*, void*);
+typedef int64_t (*iFpuppp_t)(void*, uint64_t, void*, void*, void*);
+typedef void* (*pFpLLiN_t)(void*, uintptr_t, uintptr_t, int64_t, ...);
+typedef void* (*pFppLLp_t)(void*, void*, uintptr_t, uintptr_t, void*);
+typedef void* (*pFpppLp_t)(void*, void*, void*, uintptr_t, void*);
+typedef int64_t (*iFpLiLpV_t)(void*, uintptr_t, int64_t, uintptr_t, void*, void*);
+typedef void* (*pFpLiiiI_t)(void*, uintptr_t, int64_t, int64_t, int64_t, int64_t);
+typedef int64_t (*iFpippppp_t)(void*, int64_t, void*, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(__stack_chk_fail, vFv_t) \
+	GO(_ITM_deregisterTMCloneTable, vFp_t) \
+	GO(__cxa_finalize, vFp_t) \
+	GO(__sigsetjmp, iFp_t) \
+	GO(_setjmp, iFp_t) \
+	GO(getcontext, iFp_t) \
+	GO(setjmp, iFp_t) \
+	GO(fork, lFv_t) \
+	GO(syscall, LFv_t) \
+	GO(__longjmp_chk, vFpi_t) \
+	GO(_longjmp, vFpi_t) \
+	GO(longjmp, vFpi_t) \
+	GO(_ITM_registerTMCloneTable, vFpu_t) \
+	GO(backtrace, iFpi_t) \
+	GO(munmap, iFpL_t) \
+	GO(__vprintf_chk, iFpp_t) \
+	GO(dl_iterate_phdr, iFpp_t) \
+	GO(execvp, iFpp_t) \
+	GO(sigaltstack, iFpp_t) \
+	GO(swapcontext, iFpp_t) \
+	GO(vprintf, iFpp_t) \
+	GO(execlp, iFpV_t) \
+	GO(printf, iFpV_t) \
+	GO(_IO_file_stat, iFSp_t) \
+	GO(__sysv_signal, pFip_t) \
+	GO(signal, pFip_t) \
+	GO(sigset, pFip_t) \
+	GO(sysv_signal, pFip_t) \
+	GO(backtrace_symbols, pFpi_t) \
+	GO(__realpath_chk, pFpp_t) \
+	GO(fopen, pFpp_t) \
+	GO(fopen64, pFpp_t) \
+	GO(realpath, pFpp_t) \
+	GO(syslog, vFipV_t) \
+	GO(backtrace_symbols_fd, vFpii_t) \
+	GO(_ITM_addUserCommitAction, vFpup_t) \
+	GO(__fxstat, iFiip_t) \
+	GO(__fxstat64, iFiip_t) \
+	GO(__fcntl, iFiiN_t) \
+	GO(fcntl, iFiiN_t) \
+	GO(fcntl64, iFiiN_t) \
+	GO(__lxstat, iFipp_t) \
+	GO(__lxstat64, iFipp_t) \
+	GO(__sigaction, iFipp_t) \
+	GO(__xstat, iFipp_t) \
+	GO(__xstat64, iFipp_t) \
+	GO(sigaction, iFipp_t) \
+	GO(__printf_chk, iFipV_t) \
+	GO(mprotect, iFpLi_t) \
+	GO(ftw, iFppi_t) \
+	GO(ftw64, iFppi_t) \
+	GO(__cxa_atexit, iFppp_t) \
+	GO(__isoc99_vsscanf, iFppp_t) \
+	GO(__vfprintf_chk, iFppp_t) \
+	GO(__vsscanf, iFppp_t) \
+	GO(vasprintf, iFppp_t) \
+	GO(vfprintf, iFppp_t) \
+	GO(vsscanf, iFppp_t) \
+	GO(__isoc99_fscanf, iFppV_t) \
+	GO(__isoc99_sscanf, iFppV_t) \
+	GO(fprintf, iFppV_t) \
+	GO(fscanf, iFppV_t) \
+	GO(sprintf, iFppV_t) \
+	GO(sscanf, iFppV_t) \
+	GO(swscanf, iFppV_t) \
+	GO(__open, iFpOu_t) \
+	GO(open, iFpOu_t) \
+	GO(open64, iFpOu_t) \
+	GO(readlink, lFppL_t) \
+	GO(fts_open, pFpip_t) \
+	GO(__syslog_chk, vFiipV_t) \
+	GO(qsort, vFpLLp_t) \
+	GO(__vasprintf_chk, iFpipp_t) \
+	GO(glob64, iFpipp_t) \
+	GO(__fprintf_chk, iFpipV_t) \
+	GO(__vsnprintf, iFpLpp_t) \
+	GO(__vsnprintf_chk, iFpLpp_t) \
+	GO(vsnprintf, iFpLpp_t) \
+	GO(__snprintf, iFpLpV_t) \
+	GO(snprintf, iFpLpV_t) \
+	GO(swprintf, iFpLpV_t) \
+	GO(nftw64, iFppii_t) \
+	GO(makecontext, iFppiV_t) \
+	GO(__register_atfork, iFpppp_t) \
+	GO(__vsprintf_chk, iFpppp_t) \
+	GO(scandir64, iFpppp_t) \
+	GO(vsprintf, iFpppp_t) \
+	GO(qsort_r, vFpLLpp_t) \
+	GO(__fxstatat, iFiippi_t) \
+	GO(__fxstatat64, iFiippi_t) \
+	GO(__sprintf_chk, iFpilpV_t) \
+	GO(__vswprintf_chk, iFpuppp_t) \
+	GO(vswprintf, iFpuppp_t) \
+	GO(mremap, pFpLLiN_t) \
+	GO(bsearch, pFppLLp_t) \
+	GO(lfind, pFpppLp_t) \
+	GO(lsearch, pFpppLp_t) \
+	GO(__snprintf_chk, iFpLiLpV_t) \
+	GO(__swprintf_chk, iFpLiLpV_t) \
+	GO(mmap, pFpLiiiI_t) \
+	GO(mmap64, pFpLiiiI_t) \
+	GO(__libc_start_main, iFpippppp_t)
+
+#endif // __wrappedlibcTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibdltypes.h b/src/wrapped/generated/wrappedlibdltypes.h
new file mode 100644
index 00000000..9a903f6d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibdltypes.h
@@ -0,0 +1,33 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibdlTYPES_H_
+#define __wrappedlibdlTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFp_t)(void*);
+typedef void* (*pFv_t)(void);
+typedef int64_t (*iFpp_t)(void*, void*);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef int64_t (*iFpip_t)(void*, int64_t, void*);
+typedef void* (*pFppi_t)(void*, void*, int64_t);
+typedef void* (*pFppp_t)(void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(dlclose, iFp_t) \
+	GO(dlerror, pFv_t) \
+	GO(dladdr, iFpp_t) \
+	GO(dlopen, pFpi_t) \
+	GO(dlsym, pFpp_t) \
+	GO(dlinfo, iFpip_t) \
+	GO(dlmopen, pFppi_t) \
+	GO(dlvsym, pFppp_t)
+
+#endif // __wrappedlibdlTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibgltypes.h b/src/wrapped/generated/wrappedlibgltypes.h
new file mode 100644
index 00000000..463bced6
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibgltypes.h
@@ -0,0 +1,23 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibglTYPES_H_
+#define __wrappedlibglTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(glXGetProcAddress, pFp_t) \
+	GO(glXGetProcAddressARB, pFp_t) \
+	GO(glDebugMessageCallback, vFpp_t) \
+	GO(glDebugMessageCallbackARB, vFpp_t)
+
+#endif // __wrappedlibglTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibglutypes.h b/src/wrapped/generated/wrappedlibglutypes.h
new file mode 100644
index 00000000..c3f295fa
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibglutypes.h
@@ -0,0 +1,21 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibgluTYPES_H_
+#define __wrappedlibgluTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpip_t)(void*, int64_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(gluNurbsCallback, vFpip_t) \
+	GO(gluQuadricCallback, vFpip_t) \
+	GO(gluTessCallback, vFpip_t)
+
+#endif // __wrappedlibgluTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibpthreadtypes.h b/src/wrapped/generated/wrappedlibpthreadtypes.h
new file mode 100644
index 00000000..6b2f2751
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibpthreadtypes.h
@@ -0,0 +1,66 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibpthreadTYPES_H_
+#define __wrappedlibpthreadTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int64_t (*iFp_t)(void*);
+typedef void (*vFpi_t)(void*, int64_t);
+typedef int64_t (*iFpi_t)(void*, int64_t);
+typedef int64_t (*iFpL_t)(void*, uintptr_t);
+typedef int64_t (*iFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef int64_t (*iFpLp_t)(void*, uintptr_t, void*);
+typedef int64_t (*iFppL_t)(void*, void*, uintptr_t);
+typedef int64_t (*iFppp_t)(void*, void*, void*);
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(__pthread_register_cancel, vFp_t) \
+	GO(__pthread_unregister_cancel, vFp_t) \
+	GO(__pthread_unwind_next, vFp_t) \
+	GO(pthread_attr_destroy, iFp_t) \
+	GO(pthread_attr_init, iFp_t) \
+	GO(_pthread_cleanup_pop, vFpi_t) \
+	GO(_pthread_cleanup_pop_restore, vFpi_t) \
+	GO(pthread_attr_setdetachstate, iFpi_t) \
+	GO(pthread_attr_setinheritsched, iFpi_t) \
+	GO(pthread_attr_setschedpolicy, iFpi_t) \
+	GO(pthread_attr_setscope, iFpi_t) \
+	GO(pthread_kill, iFpi_t) \
+	GO(pthread_attr_setguardsize, iFpL_t) \
+	GO(pthread_attr_setstacksize, iFpL_t) \
+	GO(__pthread_key_create, iFpp_t) \
+	GO(__pthread_once, iFpp_t) \
+	GO(pthread_attr_getdetachstate, iFpp_t) \
+	GO(pthread_attr_getguardsize, iFpp_t) \
+	GO(pthread_attr_getinheritsched, iFpp_t) \
+	GO(pthread_attr_getschedparam, iFpp_t) \
+	GO(pthread_attr_getschedpolicy, iFpp_t) \
+	GO(pthread_attr_getscope, iFpp_t) \
+	GO(pthread_attr_getstackaddr, iFpp_t) \
+	GO(pthread_attr_getstacksize, iFpp_t) \
+	GO(pthread_attr_setschedparam, iFpp_t) \
+	GO(pthread_attr_setstackaddr, iFpp_t) \
+	GO(pthread_cond_wait, iFpp_t) \
+	GO(pthread_key_create, iFpp_t) \
+	GO(pthread_once, iFpp_t) \
+	GO(_pthread_cleanup_push, vFppp_t) \
+	GO(_pthread_cleanup_push_defer, vFppp_t) \
+	GO(pthread_attr_setaffinity_np, iFpLp_t) \
+	GO(pthread_attr_setstack, iFppL_t) \
+	GO(__pthread_atfork, iFppp_t) \
+	GO(pthread_atfork, iFppp_t) \
+	GO(pthread_attr_getstack, iFppp_t) \
+	GO(pthread_cond_timedwait, iFppp_t) \
+	GO(pthread_create, iFpppp_t)
+
+#endif // __wrappedlibpthreadTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibrttypes.h b/src/wrapped/generated/wrappedlibrttypes.h
new file mode 100644
index 00000000..f3c61b10
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibrttypes.h
@@ -0,0 +1,19 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibrtTYPES_H_
+#define __wrappedlibrtTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFupp_t)(uint64_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(timer_create, iFupp_t)
+
+#endif // __wrappedlibrtTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibsmtypes.h b/src/wrapped/generated/wrappedlibsmtypes.h
new file mode 100644
index 00000000..27f9c636
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibsmtypes.h
@@ -0,0 +1,23 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibsmTYPES_H_
+#define __wrappedlibsmTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFppp_t)(void*, void*, void*);
+typedef int64_t (*iFpipp_t)(void*, int64_t, void*, void*);
+typedef void* (*pFppiiLpppip_t)(void*, void*, int64_t, int64_t, uintptr_t, void*, void*, void*, int64_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SmcRequestSaveYourselfPhase2, iFppp_t) \
+	GO(SmcInteractRequest, iFpipp_t) \
+	GO(SmcOpenConnection, pFppiiLpppip_t)
+
+#endif // __wrappedlibsmTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibssltypes.h b/src/wrapped/generated/wrappedlibssltypes.h
new file mode 100644
index 00000000..a56ea812
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibssltypes.h
@@ -0,0 +1,30 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibsslTYPES_H_
+#define __wrappedlibsslTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+typedef void (*vFpip_t)(void*, int64_t, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef intptr_t (*lFpip_t)(void*, int64_t, void*);
+typedef int64_t (*iFlpppp_t)(intptr_t, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SSL_CTX_set_default_passwd_cb, vFpp_t) \
+	GO(SSL_set_psk_client_callback, vFpp_t) \
+	GO(SSL_CTX_set_verify, vFpip_t) \
+	GO(SSL_set_verify, vFpip_t) \
+	GO(SSL_CTX_set_next_proto_select_cb, vFppp_t) \
+	GO(SSL_CTX_callback_ctrl, lFpip_t) \
+	GO(SSL_callback_ctrl, lFpip_t) \
+	GO(SSL_get_ex_new_index, iFlpppp_t)
+
+#endif // __wrappedlibsslTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibx11types.h b/src/wrapped/generated/wrappedlibx11types.h
new file mode 100644
index 00000000..0810f2a3
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibx11types.h
@@ -0,0 +1,54 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibx11TYPES_H_
+#define __wrappedlibx11TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef int64_t (*iFppp_t)(void*, void*, void*);
+typedef void* (*pFpip_t)(void*, int64_t, void*);
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+typedef int64_t (*iFppppp_t)(void*, void*, void*, void*, void*);
+typedef int64_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*);
+typedef void* (*pFppiiuuLi_t)(void*, void*, int64_t, int64_t, uint64_t, uint64_t, uintptr_t, int64_t);
+typedef int64_t (*iFppppiiiiuu_t)(void*, void*, void*, void*, int64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t);
+typedef void* (*pFppuiipuuii_t)(void*, void*, uint64_t, int64_t, int64_t, void*, uint64_t, uint64_t, int64_t, int64_t);
+typedef void* (*pFppiiuuuipii_t)(void*, void*, int64_t, int64_t, uint64_t, uint64_t, uint64_t, int64_t, void*, int64_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XDestroyImage, iFp_t) \
+	GO(XInitImage, iFp_t) \
+	GO(XSetErrorHandler, pFp_t) \
+	GO(XSetIOErrorHandler, pFp_t) \
+	GO(_XDeqAsyncHandler, vFpp_t) \
+	GO(XSynchronize, pFpi_t) \
+	GO(XSetAfterFunction, pFpp_t) \
+	GO(XAddConnectionWatch, iFppp_t) \
+	GO(XRemoveConnectionWatch, iFppp_t) \
+	GO(XESetCloseDisplay, pFpip_t) \
+	GO(XESetError, pFpip_t) \
+	GO(XESetEventToWire, pFpip_t) \
+	GO(XESetWireToEvent, pFpip_t) \
+	GO(XCheckIfEvent, iFpppp_t) \
+	GO(XIfEvent, iFpppp_t) \
+	GO(XPeekIfEvent, iFpppp_t) \
+	GO(XQueryExtension, iFppppp_t) \
+	GO(XRegisterIMInstantiateCallback, iFpppppp_t) \
+	GO(XUnregisterIMInstantiateCallback, iFpppppp_t) \
+	GO(XGetImage, pFppiiuuLi_t) \
+	GO(XPutImage, iFppppiiiiuu_t) \
+	GO(XCreateImage, pFppuiipuuii_t) \
+	GO(XGetSubImage, pFppiiuuuipii_t)
+
+#endif // __wrappedlibx11TYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxexttypes.h b/src/wrapped/generated/wrappedlibxexttypes.h
new file mode 100644
index 00000000..cb48dac5
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxexttypes.h
@@ -0,0 +1,27 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibxextTYPES_H_
+#define __wrappedlibxextTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef int64_t (*iFpppiiu_t)(void*, void*, void*, int64_t, int64_t, uint64_t);
+typedef void* (*pFppppip_t)(void*, void*, void*, void*, int64_t, void*);
+typedef void* (*pFppuippuu_t)(void*, void*, uint64_t, int64_t, void*, void*, uint64_t, uint64_t);
+typedef int64_t (*iFppppiiiiuui_t)(void*, void*, void*, void*, int64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XSetExtensionErrorHandler, pFp_t) \
+	GO(XShmGetImage, iFpppiiu_t) \
+	GO(XextAddDisplay, pFppppip_t) \
+	GO(XShmCreateImage, pFppuippuu_t) \
+	GO(XShmPutImage, iFppppiiiiuui_t)
+
+#endif // __wrappedlibxextTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxtsttypes.h b/src/wrapped/generated/wrappedlibxtsttypes.h
new file mode 100644
index 00000000..f13097ea
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxtsttypes.h
@@ -0,0 +1,20 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibxtstTYPES_H_
+#define __wrappedlibxtstTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XRecordEnableContext, iFpppp_t) \
+	GO(XRecordEnableContextAsync, iFpppp_t)
+
+#endif // __wrappedlibxtstTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibxttypes.h b/src/wrapped/generated/wrappedlibxttypes.h
new file mode 100644
index 00000000..8d49e866
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibxttypes.h
@@ -0,0 +1,19 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibxtTYPES_H_
+#define __wrappedlibxtTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpuipp_t)(void*, uint64_t, int64_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(XtAddEventHandler, vFpuipp_t)
+
+#endif // __wrappedlibxtTYPES_H_
diff --git a/src/wrapped/generated/wrappedlibztypes.h b/src/wrapped/generated/wrappedlibztypes.h
new file mode 100644
index 00000000..b2201a7d
--- /dev/null
+++ b/src/wrapped/generated/wrappedlibztypes.h
@@ -0,0 +1,28 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedlibzTYPES_H_
+#define __wrappedlibzTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFp_t)(void*);
+typedef int64_t (*iFppi_t)(void*, void*, int64_t);
+typedef int64_t (*iFpipi_t)(void*, int64_t, void*, int64_t);
+typedef int64_t (*iFpiiiiipi_t)(void*, int64_t, int64_t, int64_t, int64_t, int64_t, void*, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(deflateEnd, iFp_t) \
+	GO(inflateEnd, iFp_t) \
+	GO(inflateInit, iFp_t) \
+	GO(inflateInit_, iFppi_t) \
+	GO(deflateInit_, iFpipi_t) \
+	GO(inflateInit2_, iFpipi_t) \
+	GO(deflateInit2_, iFpiiiiipi_t)
+
+#endif // __wrappedlibzTYPES_H_
diff --git a/src/wrapped/generated/wrappedopenaltypes.h b/src/wrapped/generated/wrappedopenaltypes.h
new file mode 100644
index 00000000..6889c3ba
--- /dev/null
+++ b/src/wrapped/generated/wrappedopenaltypes.h
@@ -0,0 +1,25 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedopenalTYPES_H_
+#define __wrappedopenalTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFv_t)(void);
+typedef void* (*pFp_t)(void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFiiipp_t)(int64_t, int64_t, int64_t, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(alRequestFoldbackStop, vFv_t) \
+	GO(alGetProcAddress, pFp_t) \
+	GO(alcGetProcAddress, pFpp_t) \
+	GO(alRequestFoldbackStart, vFiiipp_t)
+
+#endif // __wrappedopenalTYPES_H_
diff --git a/src/wrapped/generated/wrappedpangotypes.h b/src/wrapped/generated/wrappedpangotypes.h
new file mode 100644
index 00000000..7e535062
--- /dev/null
+++ b/src/wrapped/generated/wrappedpangotypes.h
@@ -0,0 +1,19 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedpangoTYPES_H_
+#define __wrappedpangoTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpp_t)(void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(pango_attribute_init, vFpp_t)
+
+#endif // __wrappedpangoTYPES_H_
diff --git a/src/wrapped/generated/wrappedpulsetypes.h b/src/wrapped/generated/wrappedpulsetypes.h
new file mode 100644
index 00000000..2fc994fd
--- /dev/null
+++ b/src/wrapped/generated/wrappedpulsetypes.h
@@ -0,0 +1,102 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedpulseTYPES_H_
+#define __wrappedpulseTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int64_t (*iFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFppp_t)(void*, void*, void*);
+typedef void* (*pFipp_t)(int64_t, void*, void*);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef int64_t (*iFppip_t)(void*, void*, int64_t, void*);
+typedef int64_t (*iFpppV_t)(void*, void*, void*, void*);
+typedef void* (*pFpipp_t)(void*, int64_t, void*, void*);
+typedef void* (*pFpupp_t)(void*, uint64_t, void*, void*);
+typedef void* (*pFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
+typedef void* (*pFpuipp_t)(void*, uint64_t, int64_t, void*, void*);
+typedef void* (*pFpuupp_t)(void*, uint64_t, uint64_t, void*, void*);
+typedef void* (*pFpuppp_t)(void*, uint64_t, void*, void*, void*);
+typedef void* (*pFppppp_t)(void*, void*, void*, void*, void*);
+typedef int64_t (*iFppLpIi_t)(void*, void*, uintptr_t, void*, int64_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(pa_mainloop_free, vFp_t) \
+	GO(pa_threaded_mainloop_free, vFp_t) \
+	GO(pa_signal_init, iFp_t) \
+	GO(pa_mainloop_get_api, pFp_t) \
+	GO(pa_threaded_mainloop_get_api, pFp_t) \
+	GO(pa_signal_set_destroy, vFpp_t) \
+	GO(pa_context_new, pFpp_t) \
+	GO(pa_context_set_event_callback, vFppp_t) \
+	GO(pa_context_set_state_callback, vFppp_t) \
+	GO(pa_context_set_subscribe_callback, vFppp_t) \
+	GO(pa_mainloop_set_poll_func, vFppp_t) \
+	GO(pa_stream_set_buffer_attr_callback, vFppp_t) \
+	GO(pa_stream_set_event_callback, vFppp_t) \
+	GO(pa_stream_set_latency_update_callback, vFppp_t) \
+	GO(pa_stream_set_moved_callback, vFppp_t) \
+	GO(pa_stream_set_overflow_callback, vFppp_t) \
+	GO(pa_stream_set_read_callback, vFppp_t) \
+	GO(pa_stream_set_started_callback, vFppp_t) \
+	GO(pa_stream_set_state_callback, vFppp_t) \
+	GO(pa_stream_set_suspended_callback, vFppp_t) \
+	GO(pa_stream_set_underflow_callback, vFppp_t) \
+	GO(pa_stream_set_write_callback, vFppp_t) \
+	GO(pa_signal_new, pFipp_t) \
+	GO(pa_context_drain, pFppp_t) \
+	GO(pa_context_exit_daemon, pFppp_t) \
+	GO(pa_context_get_client_info_list, pFppp_t) \
+	GO(pa_context_get_module_info_list, pFppp_t) \
+	GO(pa_context_get_server_info, pFppp_t) \
+	GO(pa_context_get_sink_info_list, pFppp_t) \
+	GO(pa_context_get_sink_input_info_list, pFppp_t) \
+	GO(pa_context_get_source_info_list, pFppp_t) \
+	GO(pa_context_new_with_proplist, pFppp_t) \
+	GO(pa_stream_drain, pFppp_t) \
+	GO(pa_stream_flush, pFppp_t) \
+	GO(pa_stream_prebuf, pFppp_t) \
+	GO(pa_stream_trigger, pFppp_t) \
+	GO(pa_stream_update_timing_info, pFppp_t) \
+	GO(pa_context_connect, iFppip_t) \
+	GO(pa_proplist_setf, iFpppV_t) \
+	GO(pa_stream_cork, pFpipp_t) \
+	GO(pa_context_get_sink_info_by_index, pFpupp_t) \
+	GO(pa_context_get_sink_input_info, pFpupp_t) \
+	GO(pa_context_get_source_info_by_index, pFpupp_t) \
+	GO(pa_context_subscribe, pFpupp_t) \
+	GO(pa_context_unload_module, pFpupp_t) \
+	GO(pa_stream_update_sample_rate, pFpupp_t) \
+	GO(pa_context_get_sink_info_by_name, pFpppp_t) \
+	GO(pa_context_get_source_info_by_name, pFpppp_t) \
+	GO(pa_context_proplist_remove, pFpppp_t) \
+	GO(pa_context_set_default_sink, pFpppp_t) \
+	GO(pa_context_set_default_source, pFpppp_t) \
+	GO(pa_context_set_name, pFpppp_t) \
+	GO(pa_stream_proplist_remove, pFpppp_t) \
+	GO(pa_stream_set_buffer_attr, pFpppp_t) \
+	GO(pa_stream_set_name, pFpppp_t) \
+	GO(pa_context_proplist_update, pFpippp_t) \
+	GO(pa_stream_proplist_update, pFpippp_t) \
+	GO(pa_context_set_sink_input_mute, pFpuipp_t) \
+	GO(pa_context_set_source_mute_by_index, pFpuipp_t) \
+	GO(pa_context_move_sink_input_by_index, pFpuupp_t) \
+	GO(pa_context_set_sink_input_volume, pFpuppp_t) \
+	GO(pa_context_set_sink_volume_by_index, pFpuppp_t) \
+	GO(pa_context_set_source_volume_by_index, pFpuppp_t) \
+	GO(pa_context_load_module, pFppppp_t) \
+	GO(pa_context_set_source_volume_by_name, pFppppp_t) \
+	GO(pa_stream_write, iFppLpIi_t)
+
+#endif // __wrappedpulseTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1imagetypes.h b/src/wrapped/generated/wrappedsdl1imagetypes.h
new file mode 100644
index 00000000..89c5e486
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1imagetypes.h
@@ -0,0 +1,37 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl1imageTYPES_H_
+#define __wrappedsdl1imageTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpip_t)(void*, int64_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(IMG_LoadBMP_RW, pFp_t) \
+	GO(IMG_LoadCUR_RW, pFp_t) \
+	GO(IMG_LoadGIF_RW, pFp_t) \
+	GO(IMG_LoadICO_RW, pFp_t) \
+	GO(IMG_LoadJPG_RW, pFp_t) \
+	GO(IMG_LoadLBM_RW, pFp_t) \
+	GO(IMG_LoadPCX_RW, pFp_t) \
+	GO(IMG_LoadPNG_RW, pFp_t) \
+	GO(IMG_LoadPNM_RW, pFp_t) \
+	GO(IMG_LoadTGA_RW, pFp_t) \
+	GO(IMG_LoadTIF_RW, pFp_t) \
+	GO(IMG_LoadWEBP_RW, pFp_t) \
+	GO(IMG_LoadXCF_RW, pFp_t) \
+	GO(IMG_LoadXPM_RW, pFp_t) \
+	GO(IMG_LoadXV_RW, pFp_t) \
+	GO(IMG_Load_RW, pFpi_t) \
+	GO(IMG_LoadTyped_RW, pFpip_t)
+
+#endif // __wrappedsdl1imageTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1mixertypes.h b/src/wrapped/generated/wrappedsdl1mixertypes.h
new file mode 100644
index 00000000..26106a46
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1mixertypes.h
@@ -0,0 +1,33 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl1mixerTYPES_H_
+#define __wrappedsdl1mixerTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef int64_t (*iFip_t)(int64_t, void*);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpii_t)(void*, int64_t, int64_t);
+typedef int64_t (*iFippp_t)(int64_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(Mix_ChannelFinished, vFp_t) \
+	GO(Mix_HookMusicFinished, vFp_t) \
+	GO(Mix_LoadMUS_RW, pFp_t) \
+	GO(Mix_HookMusic, vFpp_t) \
+	GO(Mix_SetPostMix, vFpp_t) \
+	GO(Mix_UnregisterEffect, iFip_t) \
+	GO(Mix_LoadWAV_RW, pFpi_t) \
+	GO(Mix_LoadMUSType_RW, pFpii_t) \
+	GO(Mix_RegisterEffect, iFippp_t)
+
+#endif // __wrappedsdl1mixerTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1ttftypes.h b/src/wrapped/generated/wrappedsdl1ttftypes.h
new file mode 100644
index 00000000..b61ad3e7
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1ttftypes.h
@@ -0,0 +1,21 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl1ttfTYPES_H_
+#define __wrappedsdl1ttfTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFpii_t)(void*, int64_t, int64_t);
+typedef void* (*pFpiii_t)(void*, int64_t, int64_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(TTF_OpenFontRW, pFpii_t) \
+	GO(TTF_OpenFontIndexRW, pFpiii_t)
+
+#endif // __wrappedsdl1ttfTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl1types.h b/src/wrapped/generated/wrappedsdl1types.h
new file mode 100644
index 00000000..b510c583
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl1types.h
@@ -0,0 +1,65 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl1TYPES_H_
+#define __wrappedsdl1TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int64_t (*iFp_t)(void*);
+typedef uint64_t (*uFp_t)(void*);
+typedef uint64_t (*UFp_t)(void*);
+typedef void* (*pFv_t)(void);
+typedef void* (*pFp_t)(void*);
+typedef int64_t (*iFup_t)(uint64_t, void*);
+typedef int64_t (*iFpp_t)(void*, void*);
+typedef uint64_t (*uFpW_t)(void*, uint16_t);
+typedef uint64_t (*uFpu_t)(void*, uint64_t);
+typedef uint64_t (*uFpU_t)(void*, uint64_t);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef int64_t (*iFppi_t)(void*, void*, int64_t);
+typedef void* (*pFupp_t)(uint64_t, void*, void*);
+typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SDL_KillThread, vFp_t) \
+	GO(SDL_SetEventFilter, vFp_t) \
+	GO(SDL_UnloadObject, vFp_t) \
+	GO(SDL_GetWMInfo, iFp_t) \
+	GO(SDL_RemoveTimer, iFp_t) \
+	GO(SDL_ReadBE16, uFp_t) \
+	GO(SDL_ReadBE32, uFp_t) \
+	GO(SDL_ReadLE16, uFp_t) \
+	GO(SDL_ReadLE32, uFp_t) \
+	GO(SDL_ReadBE64, UFp_t) \
+	GO(SDL_ReadLE64, UFp_t) \
+	GO(SDL_GetEventFilter, pFv_t) \
+	GO(SDL_GL_GetProcAddress, pFp_t) \
+	GO(SDL_LoadObject, pFp_t) \
+	GO(SDL_SetTimer, iFup_t) \
+	GO(SDL_OpenAudio, iFpp_t) \
+	GO(SDL_WriteBE16, uFpW_t) \
+	GO(SDL_WriteLE16, uFpW_t) \
+	GO(SDL_WriteBE32, uFpu_t) \
+	GO(SDL_WriteLE32, uFpu_t) \
+	GO(SDL_WriteBE64, uFpU_t) \
+	GO(SDL_WriteLE64, uFpU_t) \
+	GO(SDL_LoadBMP_RW, pFpi_t) \
+	GO(SDL_RWFromConstMem, pFpi_t) \
+	GO(SDL_RWFromFP, pFpi_t) \
+	GO(SDL_RWFromMem, pFpi_t) \
+	GO(SDL_CreateThread, pFpp_t) \
+	GO(SDL_LoadFunction, pFpp_t) \
+	GO(SDL_RWFromFile, pFpp_t) \
+	GO(SDL_SaveBMP_RW, iFppi_t) \
+	GO(SDL_AddTimer, pFupp_t) \
+	GO(SDL_LoadWAV_RW, pFpippp_t)
+
+#endif // __wrappedsdl1TYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2imagetypes.h b/src/wrapped/generated/wrappedsdl2imagetypes.h
new file mode 100644
index 00000000..57120cbe
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2imagetypes.h
@@ -0,0 +1,43 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl2imageTYPES_H_
+#define __wrappedsdl2imageTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFp_t)(void*);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef int64_t (*iFppi_t)(void*, void*, int64_t);
+typedef void* (*pFpip_t)(void*, int64_t, void*);
+typedef void* (*pFppi_t)(void*, void*, int64_t);
+typedef void* (*pFppip_t)(void*, void*, int64_t, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(IMG_LoadBMP_RW, pFp_t) \
+	GO(IMG_LoadCUR_RW, pFp_t) \
+	GO(IMG_LoadGIF_RW, pFp_t) \
+	GO(IMG_LoadICO_RW, pFp_t) \
+	GO(IMG_LoadJPG_RW, pFp_t) \
+	GO(IMG_LoadLBM_RW, pFp_t) \
+	GO(IMG_LoadPCX_RW, pFp_t) \
+	GO(IMG_LoadPNG_RW, pFp_t) \
+	GO(IMG_LoadPNM_RW, pFp_t) \
+	GO(IMG_LoadTGA_RW, pFp_t) \
+	GO(IMG_LoadTIF_RW, pFp_t) \
+	GO(IMG_LoadWEBP_RW, pFp_t) \
+	GO(IMG_LoadXCF_RW, pFp_t) \
+	GO(IMG_LoadXPM_RW, pFp_t) \
+	GO(IMG_LoadXV_RW, pFp_t) \
+	GO(IMG_Load_RW, pFpi_t) \
+	GO(IMG_SavePNG_RW, iFppi_t) \
+	GO(IMG_LoadTyped_RW, pFpip_t) \
+	GO(IMG_LoadTexture_RW, pFppi_t) \
+	GO(IMG_LoadTextureTyped_RW, pFppip_t)
+
+#endif // __wrappedsdl2imageTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2mixertypes.h b/src/wrapped/generated/wrappedsdl2mixertypes.h
new file mode 100644
index 00000000..7bc662db
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2mixertypes.h
@@ -0,0 +1,34 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl2mixerTYPES_H_
+#define __wrappedsdl2mixerTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef int64_t (*iFiw_t)(int64_t, int16_t);
+typedef int64_t (*iFip_t)(int64_t, void*);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpii_t)(void*, int64_t, int64_t);
+typedef int64_t (*iFippp_t)(int64_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(Mix_ChannelFinished, vFp_t) \
+	GO(Mix_HookMusicFinished, vFp_t) \
+	GO(Mix_HookMusic, vFpp_t) \
+	GO(Mix_SetPostMix, vFpp_t) \
+	GO(MinorityMix_SetPosition, iFiw_t) \
+	GO(Mix_UnregisterEffect, iFip_t) \
+	GO(Mix_LoadMUS_RW, pFpi_t) \
+	GO(Mix_LoadWAV_RW, pFpi_t) \
+	GO(Mix_LoadMUSType_RW, pFpii_t) \
+	GO(Mix_RegisterEffect, iFippp_t)
+
+#endif // __wrappedsdl2mixerTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2ttftypes.h b/src/wrapped/generated/wrappedsdl2ttftypes.h
new file mode 100644
index 00000000..fe3c4815
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2ttftypes.h
@@ -0,0 +1,21 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl2ttfTYPES_H_
+#define __wrappedsdl2ttfTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFpii_t)(void*, int64_t, int64_t);
+typedef void* (*pFpiii_t)(void*, int64_t, int64_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(TTF_OpenFontRW, pFpii_t) \
+	GO(TTF_OpenFontIndexRW, pFpiii_t)
+
+#endif // __wrappedsdl2ttfTYPES_H_
diff --git a/src/wrapped/generated/wrappedsdl2types.h b/src/wrapped/generated/wrappedsdl2types.h
new file mode 100644
index 00000000..3c8bb639
--- /dev/null
+++ b/src/wrapped/generated/wrappedsdl2types.h
@@ -0,0 +1,114 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsdl2TYPES_H_
+#define __wrappedsdl2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFp_t)(void*);
+typedef int64_t (*iFp_t)(void*);
+typedef int64_t (*IFp_t)(void*);
+typedef uint64_t (*uFp_t)(void*);
+typedef uint64_t (*UFp_t)(void*);
+typedef void* (*pFv_t)(void);
+typedef void* (*pFp_t)(void*);
+typedef void (*vFpp_t)(void*, void*);
+typedef void (*vFpV_t)(void*, void*);
+typedef int64_t (*iFip_t)(int64_t, void*);
+typedef int64_t (*iFWW_t)(uint16_t, uint16_t);
+typedef int64_t (*iFUU_t)(uint64_t, uint64_t);
+typedef int64_t (*iFpi_t)(void*, int64_t);
+typedef int64_t (*iFpp_t)(void*, void*);
+typedef uint64_t (*uFpW_t)(void*, uint16_t);
+typedef uint64_t (*uFpu_t)(void*, uint64_t);
+typedef uint64_t (*uFpU_t)(void*, uint64_t);
+typedef void* (*pFpi_t)(void*, int64_t);
+typedef void* (*pFpp_t)(void*, void*);
+typedef void (*vFipV_t)(int64_t, void*, void*);
+typedef int64_t (*iFupp_t)(uint64_t, void*, void*);
+typedef int64_t (*iFppi_t)(void*, void*, int64_t);
+typedef int64_t (*IFpIi_t)(void*, int64_t, int64_t);
+typedef void* (*pFupp_t)(uint64_t, void*, void*);
+typedef void* (*pFppi_t)(void*, void*, int64_t);
+typedef void* (*pFppp_t)(void*, void*, void*);
+typedef void (*vFpuup_t)(void*, uint64_t, uint64_t, void*);
+typedef int64_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
+typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, void*);
+typedef uint64_t (*uFppuu_t)(void*, void*, uint64_t, uint64_t);
+typedef int64_t (*iFpippi_t)(void*, int64_t, void*, void*, int64_t);
+typedef void* (*pFpippp_t)(void*, int64_t, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SDL_UnloadObject, vFp_t) \
+	GO(SDL_RWclose, iFp_t) \
+	GO(SDL_RemoveTimer, iFp_t) \
+	GO(SDL_SaveAllDollarTemplates, iFp_t) \
+	GO(SDL_RWtell, IFp_t) \
+	GO(SDL_ReadBE16, uFp_t) \
+	GO(SDL_ReadBE32, uFp_t) \
+	GO(SDL_ReadLE16, uFp_t) \
+	GO(SDL_ReadLE32, uFp_t) \
+	GO(SDL_ReadU8, uFp_t) \
+	GO(SDL_ReadBE64, UFp_t) \
+	GO(SDL_ReadLE64, UFp_t) \
+	GO(SDL_GetBasePath, pFv_t) \
+	GO(SDL_Vulkan_GetVkGetInstanceProcAddr, pFv_t) \
+	GO(SDL_GL_GetProcAddress, pFp_t) \
+	GO(SDL_LoadObject, pFp_t) \
+	GO(SDL_AddEventWatch, vFpp_t) \
+	GO(SDL_DelEventWatch, vFpp_t) \
+	GO(SDL_LogGetOutputFunction, vFpp_t) \
+	GO(SDL_LogSetOutputFunction, vFpp_t) \
+	GO(SDL_SetEventFilter, vFpp_t) \
+	GO(SDL_Log, vFpV_t) \
+	GO(SDL_SaveDollarTemplate, iFip_t) \
+	GO(SDL_IsJoystickNintendoSwitchPro, iFWW_t) \
+	GO(SDL_IsJoystickPS4, iFWW_t) \
+	GO(SDL_IsJoystickSteamController, iFWW_t) \
+	GO(SDL_IsJoystickXbox360, iFWW_t) \
+	GO(SDL_IsJoystickXboxOne, iFWW_t) \
+	GO(SDL_IsJoystickHIDAPI, iFUU_t) \
+	GO(SDL_IsJoystickXInput, iFUU_t) \
+	GO(SDL_GameControllerAddMappingsFromRW, iFpi_t) \
+	GO(SDL_GetEventFilter, iFpp_t) \
+	GO(SDL_OpenAudio, iFpp_t) \
+	GO(SDL_WriteBE16, uFpW_t) \
+	GO(SDL_WriteLE16, uFpW_t) \
+	GO(SDL_WriteBE32, uFpu_t) \
+	GO(SDL_WriteLE32, uFpu_t) \
+	GO(SDL_WriteU8, uFpu_t) \
+	GO(SDL_WriteBE64, uFpU_t) \
+	GO(SDL_WriteLE64, uFpU_t) \
+	GO(SDL_LoadBMP_RW, pFpi_t) \
+	GO(SDL_RWFromConstMem, pFpi_t) \
+	GO(SDL_RWFromFP, pFpi_t) \
+	GO(SDL_RWFromMem, pFpi_t) \
+	GO(SDL_LoadFunction, pFpp_t) \
+	GO(SDL_RWFromFile, pFpp_t) \
+	GO(SDL_LogCritical, vFipV_t) \
+	GO(SDL_LogDebug, vFipV_t) \
+	GO(SDL_LogError, vFipV_t) \
+	GO(SDL_LogInfo, vFipV_t) \
+	GO(SDL_LogVerbose, vFipV_t) \
+	GO(SDL_LogWarn, vFipV_t) \
+	GO(SDL_TLSSet, iFupp_t) \
+	GO(SDL_SaveBMP_RW, iFppi_t) \
+	GO(SDL_RWseek, IFpIi_t) \
+	GO(SDL_AddTimer, pFupp_t) \
+	GO(SDL_LoadFile_RW, pFppi_t) \
+	GO(SDL_CreateThread, pFppp_t) \
+	GO(SDL_qsort, vFpuup_t) \
+	GO(SDL_vsnprintf, iFpLpp_t) \
+	GO(SDL_snprintf, iFpLpV_t) \
+	GO(SDL_RWread, uFppuu_t) \
+	GO(SDL_RWwrite, uFppuu_t) \
+	GO(SDL_OpenAudioDevice, iFpippi_t) \
+	GO(SDL_LoadWAV_RW, pFpippp_t)
+
+#endif // __wrappedsdl2TYPES_H_
diff --git a/src/wrapped/generated/wrappedsmpeg2types.h b/src/wrapped/generated/wrappedsmpeg2types.h
new file mode 100644
index 00000000..8fe02baf
--- /dev/null
+++ b/src/wrapped/generated/wrappedsmpeg2types.h
@@ -0,0 +1,21 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsmpeg2TYPES_H_
+#define __wrappedsmpeg2TYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+typedef void* (*pFppii_t)(void*, void*, int64_t, int64_t);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SMPEG_setdisplay, vFpppp_t) \
+	GO(SMPEG_new_rwops, pFppii_t)
+
+#endif // __wrappedsmpeg2TYPES_H_
diff --git a/src/wrapped/generated/wrappedsmpegtypes.h b/src/wrapped/generated/wrappedsmpegtypes.h
new file mode 100644
index 00000000..658adb1e
--- /dev/null
+++ b/src/wrapped/generated/wrappedsmpegtypes.h
@@ -0,0 +1,21 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedsmpegTYPES_H_
+#define __wrappedsmpegTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef void* (*pFppi_t)(void*, void*, int64_t);
+typedef void (*vFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(SMPEG_new_rwops, pFppi_t) \
+	GO(SMPEG_setdisplay, vFpppp_t)
+
+#endif // __wrappedsmpegTYPES_H_
diff --git a/src/wrapped/generated/wrappedutiltypes.h b/src/wrapped/generated/wrappedutiltypes.h
new file mode 100644
index 00000000..33e5ddec
--- /dev/null
+++ b/src/wrapped/generated/wrappedutiltypes.h
@@ -0,0 +1,19 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedutilTYPES_H_
+#define __wrappedutilTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFpppp_t)(void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(forkpty, iFpppp_t)
+
+#endif // __wrappedutilTYPES_H_
diff --git a/src/wrapped/generated/wrappedvorbisfiletypes.h b/src/wrapped/generated/wrappedvorbisfiletypes.h
new file mode 100644
index 00000000..c135492f
--- /dev/null
+++ b/src/wrapped/generated/wrappedvorbisfiletypes.h
@@ -0,0 +1,20 @@
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
+#ifndef __wrappedvorbisfileTYPES_H_
+#define __wrappedvorbisfileTYPES_H_
+
+#ifndef LIBNAME
+#error You should only #include this file inside a wrapped*.c file
+#endif
+#ifndef ADDED_FUNCTIONS
+#define ADDED_FUNCTIONS() 
+#endif
+
+typedef int64_t (*iFppplPPPP_t)(void*, void*, void*, intptr_t, void*, void*, void*, void*);
+
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(ov_open_callbacks, iFppplPPPP_t) \
+	GO(ov_test_callbacks, iFppplPPPP_t)
+
+#endif // __wrappedvorbisfileTYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index e6244933..32952925 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -1,6 +1,6 @@
-/*****************************************************************
- * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
- *****************************************************************/
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -31,7 +31,7 @@ static void* io_convert(void* v)
 #define ST0val ST0.d
 
 int of_convert(int);
-typedef int64_t (*iF_t)();
+
 typedef void (*vFE_t)(x64emu_t*);
 typedef void (*vFv_t)(void);
 typedef void (*vFi_t)(int64_t);
@@ -135,7 +135,6 @@ typedef int64_t (*iFIi_t)(int64_t, int64_t);
 typedef int64_t (*iFui_t)(uint64_t, int64_t);
 typedef int64_t (*iFuu_t)(uint64_t, uint64_t);
 typedef int64_t (*iFup_t)(uint64_t, void*);
-typedef int64_t (*iFUU_t)(uint64_t, uint64_t);
 typedef int64_t (*iFli_t)(intptr_t, int64_t);
 typedef int64_t (*iFLL_t)(uintptr_t, uintptr_t);
 typedef int64_t (*iFLp_t)(uintptr_t, void*);
@@ -267,6 +266,7 @@ typedef int64_t (*iFEiw_t)(x64emu_t*, int64_t, int16_t);
 typedef int64_t (*iFEip_t)(x64emu_t*, int64_t, void*);
 typedef int64_t (*iFEWW_t)(x64emu_t*, uint16_t, uint16_t);
 typedef int64_t (*iFEup_t)(x64emu_t*, uint64_t, void*);
+typedef int64_t (*iFEUU_t)(x64emu_t*, uint64_t, uint64_t);
 typedef int64_t (*iFEpi_t)(x64emu_t*, void*, int64_t);
 typedef int64_t (*iFEpL_t)(x64emu_t*, void*, uintptr_t);
 typedef int64_t (*iFEpp_t)(x64emu_t*, void*, void*);
@@ -1229,7 +1229,6 @@ typedef double (*KFKK_t)(double, double);
 typedef double (*KFKp_t)(double, void*);
 #endif
 
-void iF(x64emu_t *emu, uintptr_t fcn) { iF_t fn = (iF_t)fcn; R_RAX=(int64_t)fn(); }
 void vFE(x64emu_t *emu, uintptr_t fcn) { vFE_t fn = (vFE_t)fcn; fn(emu); }
 void vFv(x64emu_t *emu, uintptr_t fcn) { vFv_t fn = (vFv_t)fcn; fn(); }
 void vFi(x64emu_t *emu, uintptr_t fcn) { vFi_t fn = (vFi_t)fcn; fn((int64_t)R_RDI); }
@@ -1333,7 +1332,6 @@ void iFIi(x64emu_t *emu, uintptr_t fcn) { iFIi_t fn = (iFIi_t)fcn; R_RAX=(int64_
 void iFui(x64emu_t *emu, uintptr_t fcn) { iFui_t fn = (iFui_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); }
 void iFuu(x64emu_t *emu, uintptr_t fcn) { iFuu_t fn = (iFuu_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
 void iFup(x64emu_t *emu, uintptr_t fcn) { iFup_t fn = (iFup_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI); }
-void iFUU(x64emu_t *emu, uintptr_t fcn) { iFUU_t fn = (iFUU_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
 void iFli(x64emu_t *emu, uintptr_t fcn) { iFli_t fn = (iFli_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (int64_t)R_RSI); }
 void iFLL(x64emu_t *emu, uintptr_t fcn) { iFLL_t fn = (iFLL_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void iFLp(x64emu_t *emu, uintptr_t fcn) { iFLp_t fn = (iFLp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
@@ -1465,6 +1463,7 @@ void iFEiw(x64emu_t *emu, uintptr_t fcn) { iFEiw_t fn = (iFEiw_t)fcn; R_RAX=(int
 void iFEip(x64emu_t *emu, uintptr_t fcn) { iFEip_t fn = (iFEip_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI); }
 void iFEWW(x64emu_t *emu, uintptr_t fcn) { iFEWW_t fn = (iFEWW_t)fcn; R_RAX=(int64_t)fn(emu, (uint16_t)R_RDI, (uint16_t)R_RSI); }
 void iFEup(x64emu_t *emu, uintptr_t fcn) { iFEup_t fn = (iFEup_t)fcn; R_RAX=(int64_t)fn(emu, (uint64_t)R_RDI, (void*)R_RSI); }
+void iFEUU(x64emu_t *emu, uintptr_t fcn) { iFEUU_t fn = (iFEUU_t)fcn; R_RAX=(int64_t)fn(emu, (uint64_t)R_RDI, (uint64_t)R_RSI); }
 void iFEpi(x64emu_t *emu, uintptr_t fcn) { iFEpi_t fn = (iFEpi_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI); }
 void iFEpL(x64emu_t *emu, uintptr_t fcn) { iFEpL_t fn = (iFEpL_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI); }
 void iFEpp(x64emu_t *emu, uintptr_t fcn) { iFEpp_t fn = (iFEpp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
@@ -2427,6 +2426,7 @@ void KFKK(x64emu_t *emu, uintptr_t fcn) { KFKK_t fn = (KFKK_t)fcn; double db=fn(
 void KFKp(x64emu_t *emu, uintptr_t fcn) { KFKp_t fn = (KFKp_t)fcn; double db=fn(FromLD((void*)(R_RSP + 8)), (void*)R_RDI); fpu_do_push(emu); ST0val = db; }
 #endif
 
+void vFEv(x64emu_t *emu, uintptr_t fcn) { vFE_t fn = (vFE_t)fcn; fn(emu); }
 void lFEv(x64emu_t *emu, uintptr_t fcn) { lFE_t fn = (lFE_t)fcn; R_RAX=(intptr_t)fn(emu); }
 void LFEv(x64emu_t *emu, uintptr_t fcn) { LFE_t fn = (LFE_t)fcn; R_RAX=(uintptr_t)fn(emu); }
 void pFEv(x64emu_t *emu, uintptr_t fcn) { pFE_t fn = (pFE_t)fcn; R_RAX=(uintptr_t)fn(emu); }
@@ -2438,7 +2438,6 @@ void iFEpLvvpp(x64emu_t *emu, uintptr_t fcn) { iFEpLpp_t fn = (iFEpLpp_t)fcn; R_
 void iFEpuvvppp(x64emu_t *emu, uintptr_t fcn) { iFEpuppp_t fn = (iFEpuppp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 
 int isSimpleWrapper(wrapper_t fun) {
-	if (fun == &iF) return 1;
 	if (fun == &vFv) return 1;
 	if (fun == &vFi) return 1;
 	if (fun == &vFu) return 1;
@@ -2527,7 +2526,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFui) return 1;
 	if (fun == &iFuu) return 1;
 	if (fun == &iFup) return 1;
-	if (fun == &iFUU) return 1;
 	if (fun == &iFli) return 1;
 	if (fun == &iFLL) return 1;
 	if (fun == &iFLp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 718ac076..295f051c 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -1,6 +1,6 @@
-/*****************************************************************
- * File automatically generated by rebuild_wrappers.py (v1.2.0.09)
- *****************************************************************/
+/*******************************************************************
+ * File automatically generated by rebuild_wrappers.py (v1.3.0.10) *
+ *******************************************************************/
 #ifndef __WRAPPER_H_
 #define __WRAPPER_H_
 #include <stdint.h>
@@ -28,7 +28,6 @@ typedef void (*wrapper_t)(x64emu_t* emu, uintptr_t fnc);
 // M = ... automatically sending 2 args
 // H = Huge 128bits value/struct
 
-void iF(x64emu_t *emu, uintptr_t fnc);
 void vFE(x64emu_t *emu, uintptr_t fnc);
 void vFv(x64emu_t *emu, uintptr_t fnc);
 void vFi(x64emu_t *emu, uintptr_t fnc);
@@ -132,7 +131,6 @@ void iFIi(x64emu_t *emu, uintptr_t fnc);
 void iFui(x64emu_t *emu, uintptr_t fnc);
 void iFuu(x64emu_t *emu, uintptr_t fnc);
 void iFup(x64emu_t *emu, uintptr_t fnc);
-void iFUU(x64emu_t *emu, uintptr_t fnc);
 void iFli(x64emu_t *emu, uintptr_t fnc);
 void iFLL(x64emu_t *emu, uintptr_t fnc);
 void iFLp(x64emu_t *emu, uintptr_t fnc);
@@ -264,6 +262,7 @@ void iFEiw(x64emu_t *emu, uintptr_t fnc);
 void iFEip(x64emu_t *emu, uintptr_t fnc);
 void iFEWW(x64emu_t *emu, uintptr_t fnc);
 void iFEup(x64emu_t *emu, uintptr_t fnc);
+void iFEUU(x64emu_t *emu, uintptr_t fnc);
 void iFEpi(x64emu_t *emu, uintptr_t fnc);
 void iFEpL(x64emu_t *emu, uintptr_t fnc);
 void iFEpp(x64emu_t *emu, uintptr_t fnc);
@@ -1226,6 +1225,7 @@ void KFKK(x64emu_t *emu, uintptr_t fnc);
 void KFKp(x64emu_t *emu, uintptr_t fnc);
 #endif
 
+void vFEv(x64emu_t *emu, uintptr_t fnc);
 void lFEv(x64emu_t *emu, uintptr_t fnc);
 void LFEv(x64emu_t *emu, uintptr_t fnc);
 void pFEv(x64emu_t *emu, uintptr_t fnc);
@@ -1238,4 +1238,4 @@ void iFEpuvvppp(x64emu_t *emu, uintptr_t fnc);
 
 int isSimpleWrapper(wrapper_t fun);
 
-#endif //__WRAPPER_H_
+#endif // __WRAPPER_H_