[WRAPPER] merged android naming so no more ifdef is needed

96 files changed, 215 insertions, 555 deletions

diff --git a/src/library_list.h b/src/library_list.h
index 63f93b52..22fb947f 100644
--- a/src/library_list.h
+++ b/src/library_list.h
@@ -270,7 +270,6 @@ GO("libtiff.so.5", libtiff5)
 GO("libbrotlidec.so", brotlidec)
 GO("libbrotlidec.so.1", brotlidec)
 
-#ifdef ANDROID
 GO("libc.so", libc)
 GO("libm.so", libm)
 GO("libbsd.so", libbsd)
@@ -294,8 +293,6 @@ GO("libXau.so", libxau)
 GO("libXxf86vm.so", libxxf86vm)
 GO("libXinerama.so", xinerama)
 GO("libXrandr.so", libxrandr)
-GO("libxrandr.so", libxrandr)
-GO("libXext.so", libxext)
 GO("libXfixes.so", libxfixes)
 GO("libXcursor.so", libxcursor)
 GO("libXrender.so", libxrender)
@@ -303,10 +300,8 @@ GO("libXft.so", libxft)
 GO("libXi.so", libxi)
 GO("libXss.so", libxss)
 GO("libXpm.so", libxpm)
-GO("libXau.so", libxau)
 GO("libXdmcp.so", libxdmcp)
 GO("libX11-xcb.so", libx11xcb)
-GO("libxcb.so", libxcb)
 GO("libxcb-xfixes.so", libxcbxfixes)
 GO("libxcb-shape.so", libxcbshape)
 GO("libxcb-shm.so", libxcbshm)
@@ -325,7 +320,6 @@ GO("libxcb-render.so", libxcbrender)
 GO("libxcb-sync.so", libxcbsync)
 GO("libxcb-xinerama.so", libxcbxinerama)
 GO("libxcb-xkb.so", libxcbxkb)
-//GO("libxcb-present.so", libxcbpresent)
 GO("libXtst.so", libxtst)
 GO("libXt.so", libxt)
 GO("libXcomposite.so", libxcomposite)
@@ -362,7 +356,6 @@ GO("libvorbis.so", libvorbis)
 GO("libogg.so", libogg)
 GO("libFLAC.so", flac)
 GO("libz.so", libz)
-GO("libandroid-shmem.so", androidshmem)
 GO("libgobject-2.0.so", gobject2)
 GO("libglib-2.0.so", glib2)
 GO("libgtk-3.so", gtk3)
@@ -373,7 +366,10 @@ GO("libgmodule-2.0.so", gmodule2)
 GO("libgtk-x11-2.0.so", gtkx112)
 GO("libgdk-x11-2.0.so", gdkx112)
 GO("libpangocairo-1.0.so", pangocairo)
-#else
+#ifdef ANDROID
+GO("libandroid-shmem.so", androidshmem)
+#endif
+
 GO("libc.so.6", libc)
 GO("libm.so.6", libm)
 GO("libdl.so.2", libdl)
@@ -389,7 +385,7 @@ GO("libgnutls.so.30", gnutls)
 GO("libmpg123.so.0", mpg123)
 //GO("libtiff.so.5", libtiff)
 GO("libxml2.so.2", xml2)
-#endif
+
 #ifdef TERMUX
 GO("libiconv.so", iconv)
 GO("libtermux-exec.so", termuxexec)
diff --git a/src/library_list_32.h b/src/library_list_32.h
index c80da950..1500389d 100644
--- a/src/library_list_32.h
+++ b/src/library_list_32.h
@@ -29,7 +29,7 @@ GO("libasound.so.2", libasound)
 GO("libasound.so", libasound)
 GO("libfreetype.so.6", freetype)
 GO("libfontconfig.so.1", fontconfig)
-#ifdef ANDROID
+
 GO("libX11.so", libx11)
 GO("libXext.so", libxext)
 GO("libXfixes.so", libxfixes)
@@ -42,7 +42,7 @@ GO("libxrandr.so", libxrandr)
 GO("libXss.so", libxss)
 GO("libXxf86vm.so", libxxf86vm)
 GO("libXinerama.so", xinerama)
-#else
+
 GO("libX11.so.6", libx11)
 GO("libXext.so.6", libxext)
 GO("libXfixes.so.3", libxfixes)
@@ -55,7 +55,7 @@ GO("libxrandr.so.2", libxrandr)
 GO("libXss.so.1", libxss)
 GO("libXxf86vm.so.1", libxxf86vm)
 GO("libXinerama.so.1", xinerama)
-#endif
+
 GO("libopenal.so.1", openal)
 GO("libopenal.so.0", openal)
 GO("libopenal.so", openal)
diff --git a/src/wrapped/wrappedflac.c b/src/wrapped/wrappedflac.c
index a27e5bbd..8420ce72 100644
--- a/src/wrapped/wrappedflac.c
+++ b/src/wrapped/wrappedflac.c
@@ -18,12 +18,8 @@
 #include "myalign.h"
 #include "bridge.h"
 
-#ifdef ANDROID
-    const char* flacName = "libFLAC.so";
-#else
-    const char* flacName = "libFLAC.so.8";
-    #define ALTNAME "libFLAC.so"
-#endif
+const char* flacName = "libFLAC.so.8";
+#define ALTNAME "libFLAC.so"
 
 #define LIBNAME flac
 
diff --git a/src/wrapped/wrappedfreetype.c b/src/wrapped/wrappedfreetype.c
index 7e02db0b..cfb5e76a 100644
--- a/src/wrapped/wrappedfreetype.c
+++ b/src/wrapped/wrappedfreetype.c
@@ -18,13 +18,9 @@
 #include "emu/x64emu_private.h"
 #include "myalign.h"
 
-const char* freetypeName = 
-#ifdef ANDROID
-    "libfreetype.so"
-#else
-    "libfreetype.so.6"
-#endif
-    ;
+const char* freetypeName = "libfreetype.so.6";
+#define ALTNAME "libfreetype.so"
+
 #define LIBNAME freetype
 
 typedef void  (*vFp_t)(void*);
diff --git a/src/wrapped/wrappedgdk3.c b/src/wrapped/wrappedgdk3.c
index 3d5e646c..c58d4064 100644
--- a/src/wrapped/wrappedgdk3.c
+++ b/src/wrapped/wrappedgdk3.c
@@ -18,11 +18,9 @@
 #include "emu/x64emu_private.h"
 #include "gtkclass.h"
 
-#ifdef ANDROID
-    const char* gdk3Name = "libgdk-3.so";
-#else
-    const char* gdk3Name = "libgdk-3.so.0";
-#endif
+const char* gdk3Name = "libgdk-3.so.0";
+#define ALTNAME "libgdk-3.so"
+
 #define LIBNAME gdk3
 
 //#define ADDED_FUNCTIONS()
@@ -198,10 +196,6 @@ EXPORT void my3_gdk_threads_set_lock_functions(x64emu_t* emu, void* enter_fn, vo
 
 #define ALTMY my3_
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgobject-2.0.so", "libgio-2.0.so", "libgdk_pixbuf-2.0.so"
-#else
 #define NEEDED_LIBS "libgobject-2.0.so.0", "libgio-2.0.so.0", "libgdk_pixbuf-2.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgdkpixbuf2.c b/src/wrapped/wrappedgdkpixbuf2.c
index 99fa1692..645dbb2c 100644
--- a/src/wrapped/wrappedgdkpixbuf2.c
+++ b/src/wrapped/wrappedgdkpixbuf2.c
@@ -17,11 +17,9 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-    const char* gdkpixbuf2Name = "libgdk_pixbuf-2.0.so";
-#else
-    const char* gdkpixbuf2Name = "libgdk_pixbuf-2.0.so.0";
-#endif
+const char* gdkpixbuf2Name = "libgdk_pixbuf-2.0.so.0";
+#define ALTNAME "libgdk_pixbuf-2.0.so"
+
 #define LIBNAME gdkpixbuf2
 
 #include "generated/wrappedgdkpixbuf2types.h"
diff --git a/src/wrapped/wrappedgdkx112.c b/src/wrapped/wrappedgdkx112.c
index a9b6cd5c..1cb65c63 100644
--- a/src/wrapped/wrappedgdkx112.c
+++ b/src/wrapped/wrappedgdkx112.c
@@ -18,11 +18,9 @@
 #include "emu/x64emu_private.h"
 #include "gtkclass.h"
 
-#ifdef ANDROID
-    const char* gdkx112Name = "libgdk-x11-2.0.so";
-#else
-    const char* gdkx112Name = "libgdk-x11-2.0.so.0";
-#endif
+const char* gdkx112Name = "libgdk-x11-2.0.so.0";
+#define ALTNAME "libgdk-x11-2.0.so"
+
 #define LIBNAME gdkx112
 
 static char* libname = NULL;
@@ -181,10 +179,6 @@ EXPORT uint32_t my_gdk_threads_add_timeout_full(x64emu_t* emu, int priotity, uin
 #define CUSTOM_INIT         \
     libname = lib->name;
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgobject-2.0.so", "libgio-2.0.so", "libgdk_pixbuf-2.0.so"
-#else
 #define NEEDED_LIBS "libgobject-2.0.so.0", "libgio-2.0.so.0", "libgdk_pixbuf-2.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c
index 5d7ec5a5..4a139824 100644
--- a/src/wrapped/wrappedgio2.c
+++ b/src/wrapped/wrappedgio2.c
@@ -20,11 +20,9 @@
 #include "myalign.h"
 #include "gtkclass.h"
 
-#ifdef ANDROID
-    const char* gio2Name = "libgio-2.0.so";
-#else
-    const char* gio2Name = "libgio-2.0.so.0";
-#endif
+const char* gio2Name = "libgio-2.0.so.0";
+#define ALTNAME "libgio-2.0.so"
+
 #define LIBNAME gio2
 
 typedef size_t(*LFv_t)(void);
@@ -633,10 +631,6 @@ EXPORT void my_g_input_stream_read_async(x64emu_t* emu, void* stream, void* buff
     SetGApplicationID(my->g_application_get_type());    \
     SetGDBusProxyID(my->g_dbus_proxy_get_type());
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgmodule-2.0.so"
-#else
 #define NEEDED_LIBS "libgmodule-2.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c
index ea534019..210729f0 100644
--- a/src/wrapped/wrappedglib2.c
+++ b/src/wrapped/wrappedglib2.c
@@ -20,11 +20,9 @@
 #include "gtkclass.h"
 #include "threads.h"
 
-#ifdef ANDROID
-    const char* glib2Name = "libglib-2.0.so";
-#else
-    const char* glib2Name = "libglib-2.0.so.0";
-#endif
+const char* glib2Name = "libglib-2.0.so.0";
+#define ALTNAME "libglib-2.0.so"
+
 #define LIBNAME glib2
 
 typedef void  (*vFppip_t)(void*, void*, int, void*);
diff --git a/src/wrapped/wrappedgmodule2.c b/src/wrapped/wrappedgmodule2.c
index d4233e11..cc71d2ef 100644
--- a/src/wrapped/wrappedgmodule2.c
+++ b/src/wrapped/wrappedgmodule2.c
@@ -12,21 +12,15 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gmodule2Name = "libgmodule-2.0.so";
-#else
-    const char* gmodule2Name = "libgmodule-2.0.so.0";
-#endif
+const char* gmodule2Name = "libgmodule-2.0.so.0";
+#define ALTNAME "libgmodule-2.0.so"
+
 #define LIBNAME gmodule2
 
 #define PRE_INIT    \
     if(box64_nogtk) \
         return -1;
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libglib-2.0.so"
-#else
 #define NEEDED_LIBS "libglib-2.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgnutls.c b/src/wrapped/wrappedgnutls.c
index 6af45d64..00d92964 100644
--- a/src/wrapped/wrappedgnutls.c
+++ b/src/wrapped/wrappedgnutls.c
@@ -18,13 +18,9 @@
 #include "emu/x64emu_private.h"
 #include "callback.h"
 
-const char* gnutlsName = 
-#if ANDROID
-    "libgnutls.so"
-#else
-    "libgnutls.so.30"
-#endif
-    ;
+const char* gnutlsName = "libgnutls.so.30";
+#define ALTNAME "libgnutls.so"
+
 #define LIBNAME gnutls
 
 #include "generated/wrappedgnutlstypes.h"
diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c
index 74dce6b9..875c3d88 100644
--- a/src/wrapped/wrappedgobject2.c
+++ b/src/wrapped/wrappedgobject2.c
@@ -19,11 +19,9 @@
 #include "gtkclass.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-    const char* gobject2Name = "libgobject-2.0.so";
-#else
-    const char* gobject2Name = "libgobject-2.0.so.0";
-#endif
+const char* gobject2Name = "libgobject-2.0.so.0";
+#define ALTNAME "libgobject-2.0.so"
+
 #define LIBNAME gobject2
 
 typedef size_t(*LFv_t)(void);
@@ -943,10 +941,6 @@ EXPORT void* my_g_type_value_table_peek(x64emu_t* emu, size_t type)
     SetGClassPeek(my->g_type_class_peek);   \
     SetGTypeParent(my->g_type_parent);
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libglib-2.0.so"
-#else
 #define NEEDED_LIBS "libglib-2.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgstallocators.c b/src/wrapped/wrappedgstallocators.c
index ebdcb0fa..74cd1f3b 100644
--- a/src/wrapped/wrappedgstallocators.c
+++ b/src/wrapped/wrappedgstallocators.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstallocatorsName = "libgstallocators-1.0.so";
-#else
-    const char* gstallocatorsName = "libgstallocators-1.0.so.0";
-#endif
+const char* gstallocatorsName = "libgstallocators-1.0.so.0";
+#define ALTNAME "libgstallocators-1.0.so"
 
 #define LIBNAME gstallocators
 
diff --git a/src/wrapped/wrappedgstapp.c b/src/wrapped/wrappedgstapp.c
index bc712f7a..3815c347 100644
--- a/src/wrapped/wrappedgstapp.c
+++ b/src/wrapped/wrappedgstapp.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstappName = "libgstapp-1.0.so";
-#else
-    const char* gstappName = "libgstapp-1.0.so.0";
-#endif
+const char* gstappName = "libgstapp-1.0.so.0";
+#define ALTNAME "libgstapp-1.0.so"
 
 #define LIBNAME gstapp
 
diff --git a/src/wrapped/wrappedgstaudio.c b/src/wrapped/wrappedgstaudio.c
index 943d2fa7..9e52556e 100644
--- a/src/wrapped/wrappedgstaudio.c
+++ b/src/wrapped/wrappedgstaudio.c
@@ -20,11 +20,8 @@
 #include "gtkclass.h"
 #include "fileutils.h"
 
-#ifdef ANDROID
-    const char* gstaudioName = "libgstaudio-1.0.so";
-#else
-    const char* gstaudioName = "libgstaudio-1.0.so.0";
-#endif
+const char* gstaudioName = "libgstaudio-1.0.so.0";
+#define ALTNAME "libgstaudio-1.0.so"
 
 #define LIBNAME gstaudio
 
@@ -46,10 +43,6 @@ typedef size_t  (*LFv_t)();
     SetGstAudioDecoderID(my->gst_audio_decoder_get_type()); \
     SetGstAudioFilterID(my->gst_audio_filter_get_type());
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgstreamer-1.0.so"
-#else
 #define NEEDED_LIBS "libgstreamer-1.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgstbase.c b/src/wrapped/wrappedgstbase.c
index b3d85b35..786b706e 100644
--- a/src/wrapped/wrappedgstbase.c
+++ b/src/wrapped/wrappedgstbase.c
@@ -20,11 +20,8 @@
 #include "gtkclass.h"
 #include "fileutils.h"
 
-#ifdef ANDROID
-    const char* gstbaseName = "libgstbase-1.0.so";
-#else
-    const char* gstbaseName = "libgstbase-1.0.so.0";
-#endif
+const char* gstbaseName = "libgstbase-1.0.so.0";
+#define ALTNAME "libgstbase-1.0.so"
 
 #define LIBNAME gstbase
 
@@ -237,10 +234,6 @@ EXPORT void my_gst_collect_pads_set_buffer_function(x64emu_t* emu, void* pads, v
     SetGstBaseSrcID(my->gst_base_src_get_type());\
     SetGstAggregatorPadID(my->gst_aggregator_pad_get_type());
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgstreamer-1.0.so"
-#else
 #define NEEDED_LIBS "libgstreamer-1.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgstcheck.c b/src/wrapped/wrappedgstcheck.c
index e52bf0b8..9092d25b 100644
--- a/src/wrapped/wrappedgstcheck.c
+++ b/src/wrapped/wrappedgstcheck.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstcheckName = "libgstcheck-1.0.so";
-#else
-    const char* gstcheckName = "libgstcheck-1.0.so.0";
-#endif
+const char* gstcheckName = "libgstcheck-1.0.so.0";
+#define ALTNAME "libgstcheck-1.0.so"
 
 #define LIBNAME gstcheck
 
diff --git a/src/wrapped/wrappedgstcontroller.c b/src/wrapped/wrappedgstcontroller.c
index c2a7cfc5..2f630154 100644
--- a/src/wrapped/wrappedgstcontroller.c
+++ b/src/wrapped/wrappedgstcontroller.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstcontrollerName = "libgstcontroller-1.0.so";
-#else
-    const char* gstcontrollerName = "libgstcontroller-1.0.so.0";
-#endif
+const char* gstcontrollerName = "libgstcontroller-1.0.so.0";
+#define ALTNAME "libgstcontroller-1.0.so"
 
 #define LIBNAME gstcontroller
 
diff --git a/src/wrapped/wrappedgstfft.c b/src/wrapped/wrappedgstfft.c
index ee3a565e..afb8b159 100644
--- a/src/wrapped/wrappedgstfft.c
+++ b/src/wrapped/wrappedgstfft.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstfftName = "libgstfft-1.0.so";
-#else
-    const char* gstfftName = "libgstfft-1.0.so.0";
-#endif
+const char* gstfftName = "libgstfft-1.0.so.0";
+#define ALTNAME "libgstfft-1.0.so"
 
 #define LIBNAME gstfft
 
diff --git a/src/wrapped/wrappedgstgl.c b/src/wrapped/wrappedgstgl.c
index 176df13b..3b3aad55 100644
--- a/src/wrapped/wrappedgstgl.c
+++ b/src/wrapped/wrappedgstgl.c
@@ -21,11 +21,8 @@
 #include "fileutils.h"
 #include "gltools.h"
 
-#ifdef ANDROID
-    const char* gstglName = "libgstgl-1.0.so";
-#else
-    const char* gstglName = "libgstgl-1.0.so.0";
-#endif
+const char* gstglName = "libgstgl-1.0.so.0";
+#define ALTNAME "libgstgl-1.0.so"
 
 #define LIBNAME gstgl
 
diff --git a/src/wrapped/wrappedgstnet.c b/src/wrapped/wrappedgstnet.c
index 53c09dc1..7cdcfb76 100644
--- a/src/wrapped/wrappedgstnet.c
+++ b/src/wrapped/wrappedgstnet.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstnetName = "libgstnet-1.0.so";
-#else
-    const char* gstnetName = "libgstnet-1.0.so.0";
-#endif
+const char* gstnetName = "libgstnet-1.0.so.0";
+#define ALTNAME "libgstnet-1.0.so"
 
 #define LIBNAME gstnet
 
diff --git a/src/wrapped/wrappedgstpbutils.c b/src/wrapped/wrappedgstpbutils.c
index eaa2ee35..d9dc054d 100644
--- a/src/wrapped/wrappedgstpbutils.c
+++ b/src/wrapped/wrappedgstpbutils.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstpbutilsName = "libgstpbutils-1.0.so";
-#else
-    const char* gstpbutilsName = "libgstpbutils-1.0.so.0";
-#endif
+const char* gstpbutilsName = "libgstpbutils-1.0.so.0";
+#define ALTNAME "libgstpbutils-1.0.so"
 
 #define LIBNAME gstpbutils
 
diff --git a/src/wrapped/wrappedgstreamer.c b/src/wrapped/wrappedgstreamer.c
index 42aa6cde..46db408b 100644
--- a/src/wrapped/wrappedgstreamer.c
+++ b/src/wrapped/wrappedgstreamer.c
@@ -21,11 +21,9 @@
 #include "gtkclass.h"
 #include "fileutils.h"
 
-#ifdef ANDROID
-    const char* gstreamerName = "libgstreamer-1.0.so";
-#else
-    const char* gstreamerName = "libgstreamer-1.0.so.0";
-#endif
+const char* gstreamerName = "libgstreamer-1.0.so.0";
+#define ALTNAME "libgstreamer-1.0.so"
+
 #define LIBNAME gstreamer
 
 typedef void    (*vFv_t)();
@@ -1153,10 +1151,6 @@ EXPORT int my_gst_buffer_foreach_meta(x64emu_t* emu, void* buff, void* f, void*
     SetGstURIHandlerID(my->gst_uri_handler_get_type());        \
     SetGstBufferPoolID(my->gst_buffer_pool_get_type());        \
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgtk-3.so"
-#else
 #define NEEDED_LIBS "libgtk-3.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgstriff.c b/src/wrapped/wrappedgstriff.c
index 35a300f1..472db7ce 100644
--- a/src/wrapped/wrappedgstriff.c
+++ b/src/wrapped/wrappedgstriff.c
@@ -13,6 +13,8 @@
 #include "x64emu.h"
 
 const char* gstriffName = "libgstriff-1.0.so.0";
+#define ALTNAME "libgstriff-1.0.so"
+
 #define LIBNAME gstriff
 
 #define PRE_INIT    \
diff --git a/src/wrapped/wrappedgstrtp.c b/src/wrapped/wrappedgstrtp.c
index ef3fa6af..00f3d020 100644
--- a/src/wrapped/wrappedgstrtp.c
+++ b/src/wrapped/wrappedgstrtp.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstrtpName = "libgstrtp-1.0.so";
-#else
-    const char* gstrtpName = "libgstrtp-1.0.so.0";
-#endif
+const char* gstrtpName = "libgstrtp-1.0.so.0";
+#define ALTNAME "libgstrtp-1.0.so"
 
 #define LIBNAME gstrtp
 
diff --git a/src/wrapped/wrappedgstrtsp.c b/src/wrapped/wrappedgstrtsp.c
index 57d45aca..ff3f0cbd 100644
--- a/src/wrapped/wrappedgstrtsp.c
+++ b/src/wrapped/wrappedgstrtsp.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstrtspName = "libgstrtsp-1.0.so";
-#else
-    const char* gstrtspName = "libgstrtsp-1.0.so.0";
-#endif
+const char* gstrtspName = "libgstrtsp-1.0.so.0";
+#define ALTNAME "libgstrtsp-1.0.so"
 
 #define LIBNAME gstrtsp
 
diff --git a/src/wrapped/wrappedgstsdp.c b/src/wrapped/wrappedgstsdp.c
index ddda7d1f..6edcee42 100644
--- a/src/wrapped/wrappedgstsdp.c
+++ b/src/wrapped/wrappedgstsdp.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gstsdpName = "libgstsdp-1.0.so";
-#else
-    const char* gstsdpName = "libgstsdp-1.0.so.0";
-#endif
+const char* gstsdpName = "libgstsdp-1.0.so.0";
+#define ALTNAME "libgstsdp-1.0.so"
 
 #define LIBNAME gstsdp
 
diff --git a/src/wrapped/wrappedgsttag.c b/src/wrapped/wrappedgsttag.c
index f7aad56a..1f02560a 100644
--- a/src/wrapped/wrappedgsttag.c
+++ b/src/wrapped/wrappedgsttag.c
@@ -12,11 +12,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* gsttagName = "libgsttag-1.0.so";
-#else
-    const char* gsttagName = "libgsttag-1.0.so.0";
-#endif
+const char* gsttagName = "libgsttag-1.0.so.0";
+#define ALTNAME "libgsttag-1.0.so"
 
 #define LIBNAME gsttag
 
diff --git a/src/wrapped/wrappedgstvideo.c b/src/wrapped/wrappedgstvideo.c
index f74223c2..d7fa4d60 100644
--- a/src/wrapped/wrappedgstvideo.c
+++ b/src/wrapped/wrappedgstvideo.c
@@ -20,11 +20,8 @@
 #include "gtkclass.h"
 #include "fileutils.h"
 
-#ifdef ANDROID
-    const char* gstvideoName = "libgstvideo-1.0.so";
-#else
-    const char* gstvideoName = "libgstvideo-1.0.so.0";
-#endif
+const char* gstvideoName = "libgstvideo-1.0.so.0";
+#define ALTNAME "libgstvideo-1.0.so"
 
 #define LIBNAME gstvideo
 
@@ -56,10 +53,6 @@ typedef size_t  (*LFv_t)();
     SetGstVideoFilterID(my->gst_video_filter_get_type());\
     SetGstVideoBufferPoolID(my->gst_video_buffer_pool_get_type());\
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgstreamer-1.0.so"
-#else
 #define NEEDED_LIBS "libgstreamer-1.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c
index edd1fbd5..99f74990 100644
--- a/src/wrapped/wrappedgtk3.c
+++ b/src/wrapped/wrappedgtk3.c
@@ -19,11 +19,8 @@
 #include "myalign.h"
 #include "gtkclass.h"
 
-#ifdef ANDROID
-    const char* gtk3Name = "libgtk-3.so";
-#else
-    const char* gtk3Name = "libgtk-3.so.0";
-#endif
+const char* gtk3Name = "libgtk-3.so.0";
+#define ALTNAME "libgtk-3.so"
 
 #define LIBNAME gtk3
 
@@ -840,10 +837,6 @@ EXPORT void my3_gtk_list_box_set_header_func(x64emu_t* emu, void* box, void* f,
     SetGtkGestureLongPressID(my->gtk_gesture_long_press_get_type());\
     SetGtkActionID(my->gtk_action_get_type());
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgdk-3.so", "libpangocairo-1.0.so", "libgio-2.0.so"
-#else
 #define NEEDED_LIBS "libgdk-3.so.0", "libpangocairo-1.0.so.0", "libgio-2.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedgtkx112.c b/src/wrapped/wrappedgtkx112.c
index 2640ab2e..98cde252 100644
--- a/src/wrapped/wrappedgtkx112.c
+++ b/src/wrapped/wrappedgtkx112.c
@@ -19,11 +19,8 @@
 #include "myalign.h"
 #include "gtkclass.h"
 
-#ifdef ANDROID
-    const char* gtkx112Name = "libgtk-x11-2.0.so";
-#else
-    const char* gtkx112Name = "libgtk-x11-2.0.so.0";
-#endif
+const char* gtkx112Name = "libgtk-x11-2.0.so.0";
+#define ALTNAME "libgtk-x11-2.0.so"
 
 #define LIBNAME gtkx112
 
@@ -1279,10 +1276,6 @@ static void addGtk2Alternate(library_t* lib)
     SetGtkMenuBar2ID(my->gtk_menu_bar_get_type());                              \
     SetGtkTextView2ID(my->gtk_text_view_get_type());
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libgdk-x11-2.0.so", "libpangocairo-1.0.so"
-#else
 #define NEEDED_LIBS "libgdk-x11-2.0.so.0", "libpangocairo-1.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlber.c b/src/wrapped/wrappedlber.c
index c52db302..6b33edd4 100644
--- a/src/wrapped/wrappedlber.c
+++ b/src/wrapped/wrappedlber.c
@@ -17,14 +17,9 @@
 #include "callback.h"
 
 
-const char* lberName =
-#ifdef ANDROID
-    "liblber-2.4.so"
-#else
-    "liblber-2.4.so.2"
-#endif
-    ;
-#define ALTNAME "liblber-2.5.so.0"
+const char* lberName = "liblber-2.4.so.2";
+#define ALTNAME "liblber-2.4.so"
+#define ALTNAME2 "liblber-2.5.so.0"
 #define LIBNAME lber
 
 #define ADDED_FUNCTIONS()           \
diff --git a/src/wrapped/wrappedldapr.c b/src/wrapped/wrappedldapr.c
index fca96197..77eb2acd 100644
--- a/src/wrapped/wrappedldapr.c
+++ b/src/wrapped/wrappedldapr.c
@@ -16,14 +16,9 @@
 #include "librarian.h"
 #include "callback.h"
 
-const char* ldaprName =
-#ifdef ANDROID
-    "libldap_r-2.4.so"
-#else
-    "libldap_r-2.4.so.2"
-#endif
-    ;
-#define ALTNAME "libldap-2.5.so.0"
+const char* ldaprName = "libldap_r-2.4.so.2";
+#define ALTNAME "libldap_r-2.4.so"
+#define ALTNAME2 "libldap-2.5.so.0"
 #define LIBNAME ldapr
 
 #define ADDED_FUNCTIONS() \
diff --git a/src/wrapped/wrappedlibbsd.c b/src/wrapped/wrappedlibbsd.c
index 505d6516..3b495b68 100644
--- a/src/wrapped/wrappedlibbsd.c
+++ b/src/wrapped/wrappedlibbsd.c
@@ -17,11 +17,8 @@
 #include "x64tls.h"
 
 
-#ifdef ANDROID
-const char* libbsdName = "libbsd.so";
-#else
 const char* libbsdName = "libbsd.so.0";
-#endif
+#define ALTNAME "libbsd.so"
 #define LIBNAME libbsd
 
 #ifdef STATICBUILD
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c
index d10289da..22187f95 100644
--- a/src/wrapped/wrappedlibc.c
+++ b/src/wrapped/wrappedlibc.c
@@ -74,13 +74,8 @@
 
 
 #define LIBNAME libc
-const char* libcName = 
-#ifdef ANDROID
-    "libc.so"
-#else
-    "libc.so.6"
-#endif
-    ;
+const char* libcName = "libc.so.6";
+#define ALTNAME "libc.so"
 
 typedef int (*iFi_t)(int);
 typedef int (*iFp_t)(void*);
diff --git a/src/wrapped/wrappedlibcups.c b/src/wrapped/wrappedlibcups.c
index 5e4f631e..7979e3e1 100644
--- a/src/wrapped/wrappedlibcups.c
+++ b/src/wrapped/wrappedlibcups.c
@@ -18,13 +18,8 @@
 #include "emu/x64emu_private.h"
 #include "myalign.h"
 
-const char* libcupsName = 
-#ifdef ANDROID
-    "libcups.so"
-#else
-    "libcups.so.2"
-#endif
-    ;
+const char* libcupsName = "libcups.so.2";
+#define ALTNAME "libcups.so"
 
 #define LIBNAME libcups
 
diff --git a/src/wrapped/wrappedlibdl.c b/src/wrapped/wrappedlibdl.c
index 963e6671..bffe50bf 100644
--- a/src/wrapped/wrappedlibdl.c
+++ b/src/wrapped/wrappedlibdl.c
@@ -57,11 +57,8 @@ void* my_dlvsym(x64emu_t* emu, void *handle, void *symbol, const char *vername)
 int my_dlinfo(x64emu_t* emu, void* handle, int request, void* info) EXPORT;
 
 #define LIBNAME libdl
-#ifdef ANDROID
-    const char* libdlName = "libdl.so";
-#else
-    const char* libdlName = "libdl.so.2";
-#endif
+const char* libdlName = "libdl.so.2";
+#define ALTNAME "libdl.so"
 
 #define CLEARERR    if(dl->last_error) {box_free(dl->last_error); dl->last_error = NULL;}
 void dl_clear_error()
diff --git a/src/wrapped/wrappedlibm.c b/src/wrapped/wrappedlibm.c
index 15b4028c..e190f9ed 100644
--- a/src/wrapped/wrappedlibm.c
+++ b/src/wrapped/wrappedlibm.c
@@ -16,13 +16,8 @@
 #include "debug.h"
 #include "emu/x64emu_private.h"
 
-const char* libmName =
-#ifdef ANDROID
-    "libm.so"
-#else
-    "libm.so.6"
-#endif
-    ;
+const char* libmName = "libm.so.6";
+#define ALTNAME "libm.so"
 
 #define LIBNAME libm
 
diff --git a/src/wrapped/wrappedlibogg.c b/src/wrapped/wrappedlibogg.c
index f922d8af..b41fe78a 100644
--- a/src/wrapped/wrappedlibogg.c
+++ b/src/wrapped/wrappedlibogg.c
@@ -12,6 +12,8 @@
 #include "x64emu.h"
 
 const char* liboggName = "libogg.so.0";
+#define ALTNAME "libogg.so"
+
 #define LIBNAME libogg
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibpthread.c b/src/wrapped/wrappedlibpthread.c
index 2d25d66c..1effff50 100644
--- a/src/wrapped/wrappedlibpthread.c
+++ b/src/wrapped/wrappedlibpthread.c
@@ -18,12 +18,9 @@
 #include "box64context.h"
 #include "librarian.h"
 
-const char* libpthreadName = 
-#ifdef ANDROID
-    "libc.so";
-#else
-    "libpthread.so.0";
-#endif
+const char* libpthreadName = "libpthread.so.0";
+#define ALTNAME "libc.so"
+
 #define LIBNAME libpthread
 
 //EXPORT int my_pthread_attr_setschedparam(x64emu_t* emu, void* attr, void* param)
diff --git a/src/wrapped/wrappedlibsndfile.c b/src/wrapped/wrappedlibsndfile.c
index eaa54230..6e265b66 100644
--- a/src/wrapped/wrappedlibsndfile.c
+++ b/src/wrapped/wrappedlibsndfile.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-    const char* libsndfileName = "libsndfile.so";
-#else
-    const char* libsndfileName = "libsndfile.so.1";
-#endif
+const char* libsndfileName = "libsndfile.so.1";
+#define ALTNAME "libsndfile.so"
 
 #define LIBNAME libsndfile
 
diff --git a/src/wrapped/wrappedlibusb1.c b/src/wrapped/wrappedlibusb1.c
index 7e6211d3..683931be 100644
--- a/src/wrapped/wrappedlibusb1.c
+++ b/src/wrapped/wrappedlibusb1.c
@@ -18,11 +18,8 @@
 #include "emu/x64emu_private.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-    const char* libusb1Name = "libusb-1.0.so";
-#else
-    const char* libusb1Name = "libusb-1.0.so.0";
-#endif
+const char* libusb1Name = "libusb-1.0.so.0";
+#define ALTNAME "libusb-1.0.so"
 
 #define LIBNAME libusb1
 
diff --git a/src/wrapped/wrappedlibvorbis.c b/src/wrapped/wrappedlibvorbis.c
index 0807e5bf..26d6dcfd 100644
--- a/src/wrapped/wrappedlibvorbis.c
+++ b/src/wrapped/wrappedlibvorbis.c
@@ -17,11 +17,8 @@
 #include "librarian.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-	const char* libvorbisName = "libvorbis.so";
-#else
-	const char* libvorbisName = "libvorbis.so.0";
-#endif
+const char* libvorbisName = "libvorbis.so.0";
+#define ALTNAME "libvorbis.so"
 
 #define LIBNAME libvorbis
 
diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c
index 3c6d00c5..7da51e85 100644
--- a/src/wrapped/wrappedlibx11.c
+++ b/src/wrapped/wrappedlibx11.c
@@ -17,11 +17,8 @@
 #include "emu/x64emu_private.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-    const char* libx11Name = "libX11.so";
-#else
-    const char* libx11Name = "libX11.so.6";
-#endif
+const char* libx11Name = "libX11.so.6";
+#define ALTNAME "libX11.so"
 
 #define LIBNAME libx11
 
diff --git a/src/wrapped/wrappedlibx11xcb.c b/src/wrapped/wrappedlibx11xcb.c
index bac92703..c9bab0b7 100644
--- a/src/wrapped/wrappedlibx11xcb.c
+++ b/src/wrapped/wrappedlibx11xcb.c
@@ -18,6 +18,7 @@
 #include "myalign.h"
 
 const char* libx11xcbName = "libX11-xcb.so.1";
+#define ALTNAME "libX11-xcb.so"
 #define LIBNAME libx11xcb
 
 #define ADDED_FUNCTIONS()       \
diff --git a/src/wrapped/wrappedlibxau.c b/src/wrapped/wrappedlibxau.c
index b03e75eb..3d3c72c3 100644
--- a/src/wrapped/wrappedlibxau.c
+++ b/src/wrapped/wrappedlibxau.c
@@ -11,11 +11,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-	const char* libxauName = "libXau.so";
-#else
-	const char* libxauName = "libXau.so.6";
-#endif
+const char* libxauName = "libXau.so.6";
+#define ALTNAME "libXau.so"
 
 #define LIBNAME libxau
 
diff --git a/src/wrapped/wrappedlibxcb.c b/src/wrapped/wrappedlibxcb.c
index 46b78d7e..96a47c5a 100644
--- a/src/wrapped/wrappedlibxcb.c
+++ b/src/wrapped/wrappedlibxcb.c
@@ -17,11 +17,8 @@
 #include "emu/x64emu_private.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-	const char* libxcbName = "libxcb.so";
-#else
-	const char* libxcbName = "libxcb.so.1";
-#endif
+const char* libxcbName = "libxcb.so.1";
+#define ALTNAME "libxcb.so"
 
 #define LIBNAME libxcb
 
diff --git a/src/wrapped/wrappedlibxcbdri2.c b/src/wrapped/wrappedlibxcbdri2.c
index 4745c51c..335b8b3e 100644
--- a/src/wrapped/wrappedlibxcbdri2.c
+++ b/src/wrapped/wrappedlibxcbdri2.c
@@ -18,6 +18,8 @@
 #include "emu/x64emu_private.h"
 
 const char* libxcbdri2Name = "libxcb-dri2.so.0";
+#define ALTNAME "libxcb-dri2.so"
+
 #define LIBNAME libxcbdri2
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxcbdri3.c b/src/wrapped/wrappedlibxcbdri3.c
index b351dbef..d6ae5d38 100644
--- a/src/wrapped/wrappedlibxcbdri3.c
+++ b/src/wrapped/wrappedlibxcbdri3.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbdri3Name = "libxcb-dri3.so";
-#else
-	const char* libxcbdri3Name = "libxcb-dri3.so.0";
-#endif
+const char* libxcbdri3Name = "libxcb-dri3.so.0";
+#define ALTNAME "libxcb-dri3.so"
 
 #define LIBNAME libxcbdri3
 
diff --git a/src/wrapped/wrappedlibxcbglx.c b/src/wrapped/wrappedlibxcbglx.c
index 806c58df..d67714fe 100644
--- a/src/wrapped/wrappedlibxcbglx.c
+++ b/src/wrapped/wrappedlibxcbglx.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbglxName = "libxcb-glx.so";
-#else
-	const char* libxcbglxName = "libxcb-glx.so.0";
-#endif
+const char* libxcbglxName = "libxcb-glx.so.0";
+#define ALTNAME "libxcb-glx.so"
 
 #define LIBNAME libxcbglx
 
diff --git a/src/wrapped/wrappedlibxcbicccm.c b/src/wrapped/wrappedlibxcbicccm.c
index 29c9b55e..7b380dba 100644
--- a/src/wrapped/wrappedlibxcbicccm.c
+++ b/src/wrapped/wrappedlibxcbicccm.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbicccmName = "libxcb-icccm.so";
-#else
-	const char* libxcbicccmName = "libxcb-icccm.so.4";
-#endif
+const char* libxcbicccmName = "libxcb-icccm.so.4";
+#define ALTNAME "libxcb-icccm.so"
 
 #define LIBNAME libxcbicccm
 
diff --git a/src/wrapped/wrappedlibxcbimage.c b/src/wrapped/wrappedlibxcbimage.c
index 6ef51ed7..30ae1931 100644
--- a/src/wrapped/wrappedlibxcbimage.c
+++ b/src/wrapped/wrappedlibxcbimage.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbimageName = "libxcb-image.so";
-#else
-	const char* libxcbimageName = "libxcb-image.so.0";
-#endif
+const char* libxcbimageName = "libxcb-image.so.0";
+#define ALTNAME "libxcb-image.so"
 
 #define LIBNAME libxcbimage
 
diff --git a/src/wrapped/wrappedlibxcbkeysyms.c b/src/wrapped/wrappedlibxcbkeysyms.c
index 72c0022c..08894bb4 100644
--- a/src/wrapped/wrappedlibxcbkeysyms.c
+++ b/src/wrapped/wrappedlibxcbkeysyms.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbkeysymsName = "libxcb-keysyms.so";
-#else
-	const char* libxcbkeysymsName = "libxcb-keysyms.so.1";
-#endif
+const char* libxcbkeysymsName = "libxcb-keysyms.so.1";
+#define altname "libxcb-keysyms.so"
 
 #define LIBNAME libxcbkeysyms
 
diff --git a/src/wrapped/wrappedlibxcbpresent.c b/src/wrapped/wrappedlibxcbpresent.c
index 4f63285a..d142d507 100644
--- a/src/wrapped/wrappedlibxcbpresent.c
+++ b/src/wrapped/wrappedlibxcbpresent.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbpresentName = "libxcb-present.so";
-#else
-	const char* libxcbpresentName = "libxcb-present.so.0";
-#endif
+const char* libxcbpresentName = "libxcb-present.so.0";
+#define ALTNAME "libxcb-present.so"
 
 #define LIBNAME libxcbpresent
 
diff --git a/src/wrapped/wrappedlibxcbrandr.c b/src/wrapped/wrappedlibxcbrandr.c
index d4c8cbb8..910867f4 100644
--- a/src/wrapped/wrappedlibxcbrandr.c
+++ b/src/wrapped/wrappedlibxcbrandr.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbrandrName = "libxcb-randr.so";
-#else
-	const char* libxcbrandrName = "libxcb-randr.so.0";
-#endif
+const char* libxcbrandrName = "libxcb-randr.so.0";
+#define ALTNAME "libxcb-randr.so"
 
 #define LIBNAME libxcbrandr
 
diff --git a/src/wrapped/wrappedlibxcbrender.c b/src/wrapped/wrappedlibxcbrender.c
index 5deeed1a..225d3341 100644
--- a/src/wrapped/wrappedlibxcbrender.c
+++ b/src/wrapped/wrappedlibxcbrender.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbrenderName = "libxcb-render.so";
-#else
-	const char* libxcbrenderName = "libxcb-render.so.0";
-#endif
+const char* libxcbrenderName = "libxcb-render.so.0";
+#define ALTNAME "libxcb-render.so"
 
 #define LIBNAME libxcbrender
 
diff --git a/src/wrapped/wrappedlibxcbrenderutil.c b/src/wrapped/wrappedlibxcbrenderutil.c
index 6a1f7d89..79449a3c 100644
--- a/src/wrapped/wrappedlibxcbrenderutil.c
+++ b/src/wrapped/wrappedlibxcbrenderutil.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbrenderutilName = "libxcb-render-util.so";
-#else
-	const char* libxcbrenderutilName = "libxcb-render-util.so.0";
-#endif
+const char* libxcbrenderutilName = "libxcb-render-util.so.0";
+#define ALTNAME "libxcb-render-util.so"
 
 #define LIBNAME libxcbrenderutil
 
diff --git a/src/wrapped/wrappedlibxcbshape.c b/src/wrapped/wrappedlibxcbshape.c
index f1eb4e87..687fc835 100644
--- a/src/wrapped/wrappedlibxcbshape.c
+++ b/src/wrapped/wrappedlibxcbshape.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbshapeName = "libxcb-shape.so";
-#else
-	const char* libxcbshapeName = "libxcb-shape.so.0";
-#endif
+const char* libxcbshapeName = "libxcb-shape.so.0";
+#define ALTNAME "libxcb-shape.so"
 
 #define LIBNAME libxcbshape
 
diff --git a/src/wrapped/wrappedlibxcbshm.c b/src/wrapped/wrappedlibxcbshm.c
index 886d2aa1..1895c7bc 100644
--- a/src/wrapped/wrappedlibxcbshm.c
+++ b/src/wrapped/wrappedlibxcbshm.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbshmName = "libxcb-shm.so";
-#else
-	const char* libxcbshmName = "libxcb-shm.so.0";
-#endif
+const char* libxcbshmName = "libxcb-shm.so.0";
+#define ALTNAME "libxcb-shm.so"
 
 #define LIBNAME libxcbshm
 
diff --git a/src/wrapped/wrappedlibxcbsync.c b/src/wrapped/wrappedlibxcbsync.c
index 81e46870..762e861f 100644
--- a/src/wrapped/wrappedlibxcbsync.c
+++ b/src/wrapped/wrappedlibxcbsync.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbsyncName = "libxcb-sync.so";
-#else
-	const char* libxcbsyncName = "libxcb-sync.so.1";
-#endif
+const char* libxcbsyncName = "libxcb-sync.so.1";
+#define ALTNAME "libxcb-sync.so"
 
 #define LIBNAME libxcbsync
 
diff --git a/src/wrapped/wrappedlibxcbutil.c b/src/wrapped/wrappedlibxcbutil.c
index 943d8b95..7535a387 100644
--- a/src/wrapped/wrappedlibxcbutil.c
+++ b/src/wrapped/wrappedlibxcbutil.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbutilName = "libxcb-util.so";
-#else
-	const char* libxcbutilName = "libxcb-util.so.1";
-#endif
+const char* libxcbutilName = "libxcb-util.so.1";
+#define ALTNAME "libxcb-util.so"
 
 #define LIBNAME libxcbutil
 
diff --git a/src/wrapped/wrappedlibxcbxfixes.c b/src/wrapped/wrappedlibxcbxfixes.c
index ac950783..ecf58b8b 100644
--- a/src/wrapped/wrappedlibxcbxfixes.c
+++ b/src/wrapped/wrappedlibxcbxfixes.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbxfixesName = "libxcb-xfixes.so";
-#else
-	const char* libxcbxfixesName = "libxcb-xfixes.so.0";
-#endif
+const char* libxcbxfixesName = "libxcb-xfixes.so.0";
+#define ALTNAME "libxcb-xfixes.so"
 
 #define LIBNAME libxcbxfixes
 
diff --git a/src/wrapped/wrappedlibxcbxinerama.c b/src/wrapped/wrappedlibxcbxinerama.c
index 856d7e25..064588e3 100644
--- a/src/wrapped/wrappedlibxcbxinerama.c
+++ b/src/wrapped/wrappedlibxcbxinerama.c
@@ -17,11 +17,9 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbxineramaName = "libxcb-xinerama.so";
-#else
-	const char* libxcbxineramaName = "libxcb-xinerama.so.0";
-#endif
+const char* libxcbxineramaName = "libxcb-xinerama.so.0";
+#define ALTNAME "libxcb-xinerama.so"
+
 #define LIBNAME libxcbxinerama
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxcbxkb.c b/src/wrapped/wrappedlibxcbxkb.c
index cc7672b0..40766424 100644
--- a/src/wrapped/wrappedlibxcbxkb.c
+++ b/src/wrapped/wrappedlibxcbxkb.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbxkbName = "libxcb-xkb.so";
-#else
-	const char* libxcbxkbName = "libxcb-xkb.so.1";
-#endif
+const char* libxcbxkbName = "libxcb-xkb.so.1";
+#define ALTNAME "libxcb-xkb.so"
 
 #define LIBNAME libxcbxkb
 
diff --git a/src/wrapped/wrappedlibxcbxtest.c b/src/wrapped/wrappedlibxcbxtest.c
index 211efb4b..e9c98f7e 100644
--- a/src/wrapped/wrappedlibxcbxtest.c
+++ b/src/wrapped/wrappedlibxcbxtest.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-	const char* libxcbxtestName = "libxcb-xtest.so";
-#else
-	const char* libxcbxtestName = "libxcb-xtest.so.0";
-#endif
+const char* libxcbxtestName = "libxcb-xtest.so.0";
+#define ALTNAME "libxcb-xtest.so"
 
 #define LIBNAME libxcbxtest
 
diff --git a/src/wrapped/wrappedlibxcomposite.c b/src/wrapped/wrappedlibxcomposite.c
index 0521f933..1fa7f55a 100644
--- a/src/wrapped/wrappedlibxcomposite.c
+++ b/src/wrapped/wrappedlibxcomposite.c
@@ -12,11 +12,8 @@
 #include "x64emu.h"
 #include "debug.h"
 
-#ifdef ANDROID
-	const char* libxcompositeName = "libXcomposite.so";
-#else
-	const char* libxcompositeName = "libXcomposite.so.1";
-#endif
+const char* libxcompositeName = "libXcomposite.so.1";
+#define ALTNAME "libXcomposite.so"
 
 #define LIBNAME libxcomposite
 
diff --git a/src/wrapped/wrappedlibxcursor.c b/src/wrapped/wrappedlibxcursor.c
index b70911a8..c9d79921 100644
--- a/src/wrapped/wrappedlibxcursor.c
+++ b/src/wrapped/wrappedlibxcursor.c
@@ -11,19 +11,12 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-	const char* libxcursorName = "libXcursor.so";
-#else
-	const char* libxcursorName = "libXcursor.so.1";
-#endif
+const char* libxcursorName = "libXcursor.so.1";
+#define ALTNAME "libXcursor.so"
 
 #define LIBNAME libxcursor
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libX11.so", "libXfixes.so", "libXrender.so"
-#else
 #define NEEDED_LIBS "libX11.so.6", "libXfixes.so.3", "libXrender.so.1"
-#endif
 
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedlibxdamage.c b/src/wrapped/wrappedlibxdamage.c
index 8637f2a6..71be3d35 100644
--- a/src/wrapped/wrappedlibxdamage.c
+++ b/src/wrapped/wrappedlibxdamage.c
@@ -12,11 +12,8 @@
 #include "x64emu.h"
 #include "debug.h"
 
-#ifdef ANDROID
-	const char* libxdamageName = "libXdamage.so";
-#else
-	const char* libxdamageName = "libXdamage.so.1";
-#endif
+const char* libxdamageName = "libXdamage.so.1";
+#define ALTNAME "libXdamage.so"
 
 #define LIBNAME libxdamage
 
diff --git a/src/wrapped/wrappedlibxdmcp.c b/src/wrapped/wrappedlibxdmcp.c
index 39a47d0a..c7822f0d 100644
--- a/src/wrapped/wrappedlibxdmcp.c
+++ b/src/wrapped/wrappedlibxdmcp.c
@@ -11,11 +11,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-	const char* libxdmcpName = "libXdmcp.so";
-#else
-	const char* libxdmcpName = "libXdmcp.so.6";
-#endif
+const char* libxdmcpName = "libXdmcp.so.6";
+#define ALTNAME "libXdmcp.so"
 
 #define LIBNAME libxdmcp
 
diff --git a/src/wrapped/wrappedlibxext.c b/src/wrapped/wrappedlibxext.c
index 793426a2..9d48a9a9 100644
--- a/src/wrapped/wrappedlibxext.c
+++ b/src/wrapped/wrappedlibxext.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-    const char* libxextName = "libXext.so";
-#else
-    const char* libxextName = "libXext.so.6";
-#endif
+const char* libxextName = "libXext.so.6";
+#define ALTNAME "libXext.so"
 
 #define LIBNAME libxext
 
diff --git a/src/wrapped/wrappedlibxfixes.c b/src/wrapped/wrappedlibxfixes.c
index 1def73a2..b68766c3 100644
--- a/src/wrapped/wrappedlibxfixes.c
+++ b/src/wrapped/wrappedlibxfixes.c
@@ -11,18 +11,11 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* libxfixesName = "libXfixes.so";
-#else
-    const char* libxfixesName = "libXfixes.so.3";
-#endif
+const char* libxfixesName = "libXfixes.so.3";
+#define ALTNAME "libXfixes.so"
 
 #define LIBNAME libxfixes
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libX11.so", "libxcb.so", "libXau.so", "libXdmcp.so"
-#else
 #define NEEDED_LIBS "libX11.so.6", "libxcb.so.1", "libXau.so.6", "libXdmcp.so.6"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxft.c b/src/wrapped/wrappedlibxft.c
index be339e18..bfe1dd64 100644
--- a/src/wrapped/wrappedlibxft.c
+++ b/src/wrapped/wrappedlibxft.c
@@ -18,11 +18,8 @@
 #include "emu/x64emu_private.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-    const char* libxftName = "libXft.so";
-#else
-    const char* libxftName = "libXft.so.2";
-#endif
+const char* libxftName = "libXft.so.2";
+#define ALTNAME "libXft.so"
 
 #define LIBNAME libxft
 
diff --git a/src/wrapped/wrappedlibxi.c b/src/wrapped/wrappedlibxi.c
index 271048cd..83d26428 100644
--- a/src/wrapped/wrappedlibxi.c
+++ b/src/wrapped/wrappedlibxi.c
@@ -11,11 +11,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* libxiName = "libXi.so";
-#else
-    const char* libxiName = "libXi.so.6";
-#endif
+const char* libxiName = "libXi.so.6";
+#define ALTNAME "libXi.so"
 
 #define LIBNAME libxi
 
diff --git a/src/wrapped/wrappedlibxmu.c b/src/wrapped/wrappedlibxmu.c
index f4229dfd..a520f920 100644
--- a/src/wrapped/wrappedlibxmu.c
+++ b/src/wrapped/wrappedlibxmu.c
@@ -11,18 +11,11 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* libxmuName = "libXmu.so";
-#else
-    const char* libxmuName = "libXmu.so.6";
-#endif
+const char* libxmuName = "libXmu.so.6";
+#define ALTNAME "libXmu.so"
 
 #define LIBNAME libxmu
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libX11.so", "libXext.so"
-#else
 #define NEEDED_LIBS "libX11.so.6", "libXext.so.6"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxpm.c b/src/wrapped/wrappedlibxpm.c
index 418ee87b..22fde5e2 100644
--- a/src/wrapped/wrappedlibxpm.c
+++ b/src/wrapped/wrappedlibxpm.c
@@ -11,18 +11,11 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* libxpmName = "libXpm.so";
-#else
-    const char* libxpmName = "libXpm.so.4";
-#endif
+const char* libxpmName = "libXpm.so.4";
+#define ALTNAME "libXpm.so"
 
 #define LIBNAME libxpm
 
-#ifdef ANDROID
-    #define NEEDED_LIBS "libX11.so", "libXext.so"
-#else
-    #define NEEDED_LIBS "libX11.so.6", "libXext.so.6"
-#endif
+#define NEEDED_LIBS "libX11.so.6", "libXext.so.6"
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxpresent.c b/src/wrapped/wrappedlibxpresent.c
index 2a5ec87d..a1ef31d5 100644
--- a/src/wrapped/wrappedlibxpresent.c
+++ b/src/wrapped/wrappedlibxpresent.c
@@ -12,11 +12,8 @@
 #include "x64emu.h"
 #include "debug.h"
 
-#ifdef ANDROID
-	const char* libxpresentName = "libXpresent.so";
-#else
-	const char* libxpresentName = "libXpresent.so.1";
-#endif
+const char* libxpresentName = "libXpresent.so.1";
+#define ALTNAME "libXpresent.so"
 
 #define LIBNAME libxpresent
 
diff --git a/src/wrapped/wrappedlibxrandr.c b/src/wrapped/wrappedlibxrandr.c
index eb8a4185..271af6b2 100644
--- a/src/wrapped/wrappedlibxrandr.c
+++ b/src/wrapped/wrappedlibxrandr.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-    const char* libxrandrName = "libXrandr.so";
-#else
-    const char* libxrandrName = "libXrandr.so.2";
-#endif
+const char* libxrandrName = "libXrandr.so.2";
+#define ALTNAME "libXrandr.so"
 
 #define LIBNAME libxrandr
 
diff --git a/src/wrapped/wrappedlibxrender.c b/src/wrapped/wrappedlibxrender.c
index 3c25b2df..4b92d240 100644
--- a/src/wrapped/wrappedlibxrender.c
+++ b/src/wrapped/wrappedlibxrender.c
@@ -11,18 +11,11 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* libxrenderName = "libXrender.so";
-#else
-    const char* libxrenderName = "libXrender.so.1";
-#endif
+const char* libxrenderName = "libXrender.so.1";
+#define ALTNAME "libXrender.so"
 
 #define LIBNAME libxrender
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libX11.so"
-#else
 #define NEEDED_LIBS "libX11.so.6"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxss.c b/src/wrapped/wrappedlibxss.c
index b6359369..aea2d7d2 100644
--- a/src/wrapped/wrappedlibxss.c
+++ b/src/wrapped/wrappedlibxss.c
@@ -11,18 +11,11 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* libxssName = "libXss.so";
-#else
-    const char* libxssName = "libXss.so.1";
-#endif
+const char* libxssName = "libXss.so.1";
+#define ALTNAME "libXss.so"
 
 #define LIBNAME libxss
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libX11.so", "libXext.so"
-#else
 #define NEEDED_LIBS "libX11.so.6", "libXext.so.6"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedlibxt.c b/src/wrapped/wrappedlibxt.c
index 382b03a0..2c851ddb 100644
--- a/src/wrapped/wrappedlibxt.c
+++ b/src/wrapped/wrappedlibxt.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-    const char* libxtName = "libXt.so";
-#else
-    const char* libxtName = "libXt.so.6";
-#endif
+const char* libxtName = "libXt.so.6";
+#define ALTNAME "libXt.so"
 
 #define LIBNAME libxt
 
diff --git a/src/wrapped/wrappedlibxtst.c b/src/wrapped/wrappedlibxtst.c
index ba71efef..4e83eabc 100644
--- a/src/wrapped/wrappedlibxtst.c
+++ b/src/wrapped/wrappedlibxtst.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-    const char* libxtstName = "libXtst.so";
-#else
-    const char* libxtstName = "libXtst.so.6";
-#endif
+const char* libxtstName = "libXtst.so.6";
+#define ALTNAME "libXtst.so"
 
 #define LIBNAME libxtst
 
diff --git a/src/wrapped/wrappedlibxxf86vm.c b/src/wrapped/wrappedlibxxf86vm.c
index 72924824..aeb97060 100644
--- a/src/wrapped/wrappedlibxxf86vm.c
+++ b/src/wrapped/wrappedlibxxf86vm.c
@@ -17,11 +17,8 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-#ifdef ANDROID
-    const char* libxxf86vmName = "libXxf86vm.so";
-#else
-    const char* libxxf86vmName = "libXxf86vm.so.1";
-#endif
+const char* libxxf86vmName = "libXxf86vm.so.1";
+#define ALTNAME "libXxf86vm.so"
 
 #define LIBNAME libxxf86vm
 
diff --git a/src/wrapped/wrappedlibz.c b/src/wrapped/wrappedlibz.c
index 843ab95a..d9a07d82 100644
--- a/src/wrapped/wrappedlibz.c
+++ b/src/wrapped/wrappedlibz.c
@@ -15,11 +15,8 @@
 #include "emu/x64emu_private.h"
 #include "box64context.h"
 
-#ifdef ANDROID
-    const char* libzName = "libz.so";
-#else
-    const char* libzName = "libz.so.1";
-#endif
+const char* libzName = "libz.so.1";
+#define ALTNAME "libz.so"
 
 #define LIBNAME libz
 
diff --git a/src/wrapped/wrappedmpg123.c b/src/wrapped/wrappedmpg123.c
index 642c01fa..1d069781 100644
--- a/src/wrapped/wrappedmpg123.c
+++ b/src/wrapped/wrappedmpg123.c
@@ -17,13 +17,9 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-const char* mpg123Name = 
-#ifdef ANDROID
-    "libmpg123.so"
-#else
-    "libmpg123.so.0"
-#endif
-    ;
+const char* mpg123Name = "libmpg123.so.0";
+#define ALTNAME "libmpg123.so"
+
 #define LIBNAME mpg123
 
 #define ADDED_FUNCTIONS()           \
diff --git a/src/wrapped/wrappedpangocairo.c b/src/wrapped/wrappedpangocairo.c
index bd4464d9..8bc12819 100644
--- a/src/wrapped/wrappedpangocairo.c
+++ b/src/wrapped/wrappedpangocairo.c
@@ -12,21 +12,16 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* pangocairoName = "libpangocairo-1.0.so";
-#else
-    const char* pangocairoName = "libpangocairo-1.0.so.0";
-#endif
+const char* pangocairoName = "libpangocairo-1.0.so.0";
+#define ALTNAME "libpangocairo-1.0.so"
+
 #define LIBNAME pangocairo
 
 #define PRE_INIT    \
     if(box64_nogtk) \
         return -1;
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libpango-1.0.so"
-#else
+
 #define NEEDED_LIBS "libpango-1.0.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedpng16.c b/src/wrapped/wrappedpng16.c
index c1953f83..89cb5fe3 100644
--- a/src/wrapped/wrappedpng16.c
+++ b/src/wrapped/wrappedpng16.c
@@ -17,13 +17,9 @@
 #include "box64context.h"
 #include "emu/x64emu_private.h"
 
-const char* png16Name =
-#ifdef ANDROID
-	"libpng16.so"
-#else
-	"libpng16.so.16"
-#endif
-	;
+const char* png16Name = "libpng16.so.16";
+#define ALTNAME "libpng16.so"
+
 #define LIBNAME png16
 
 #include "generated/wrappedpng16types.h"
diff --git a/src/wrapped/wrappedpulse.c b/src/wrapped/wrappedpulse.c
index cbdb538f..d902a538 100644
--- a/src/wrapped/wrappedpulse.c
+++ b/src/wrapped/wrappedpulse.c
@@ -17,11 +17,8 @@
 #include "librarian.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-    const char* pulseName = "libpulse.so";
-#else
-    const char* pulseName = "libpulse.so.0";
-#endif
+const char* pulseName = "libpulse.so.0";
+#define ALTNAME "libpulse.so"
 
 #define LIBNAME pulse
 
diff --git a/src/wrapped/wrappedpulsesimple.c b/src/wrapped/wrappedpulsesimple.c
index b448040a..0b99b8e4 100644
--- a/src/wrapped/wrappedpulsesimple.c
+++ b/src/wrapped/wrappedpulsesimple.c
@@ -17,11 +17,8 @@
 #include "librarian.h"
 #include "myalign.h"
 
-#ifdef ANDROID
-    const char* pulsesimpleName = "libpulse-simple.so";
-#else
-    const char* pulsesimpleName = "libpulse-simple.so.0";
-#endif
+const char* pulsesimpleName = "libpulse-simple.so.0";
+#define ALTNAME "libpulse-simple.so"
 
 #define LIBNAME pulsesimple
 
@@ -29,10 +26,6 @@
     if(box64_nopulse)   \
         return -1;
 
-#ifdef ANDROID
-#define NEEDED_LIBS "libpulse.so"
-#else
 #define NEEDED_LIBS "libpulse.so.0"
-#endif
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedvorbisfile.c b/src/wrapped/wrappedvorbisfile.c
index 5ab7a557..40219047 100644
--- a/src/wrapped/wrappedvorbisfile.c
+++ b/src/wrapped/wrappedvorbisfile.c
@@ -18,11 +18,8 @@
 #include "myalign.h"
 #include "bridge.h"
 
-#ifdef ANDROID
-    const char* vorbisfileName = "libvorbisfile.so";
-#else
-    const char* vorbisfileName = "libvorbisfile.so.3";
-#endif
+const char* vorbisfileName = "libvorbisfile.so.3";
+#define ALTNAME "libvorbisfile.so"
 
 #define LIBNAME vorbisfile
 
@@ -164,10 +161,4 @@ EXPORT int32_t my_ov_test_callbacks(x64emu_t* emu, void* datasource, void* vf, v
     return ret;
 }
 
-#ifdef PANDORA
-// No really ok, because it will depends on the order of initialisation
-#define PRE_INIT \
-    vorbisfileName = (box86->sdl1mixerlib || box86->sdl2mixerlib)?vorbisfileNameAlt:vorbisfileNameReg;
-#endif
-
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedxinerama.c b/src/wrapped/wrappedxinerama.c
index a3807b85..ac53ac3b 100644
--- a/src/wrapped/wrappedxinerama.c
+++ b/src/wrapped/wrappedxinerama.c
@@ -11,11 +11,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-    const char* xineramaName = "libXinerama.so";
-#else
-    const char* xineramaName = "libXinerama.so.1";
-#endif
+const char* xineramaName = "libXinerama.so.1";
+#define ALTNAME "libXinerama.so"
 
 #define LIBNAME xinerama
 
diff --git a/src/wrapped/wrappedxkbcommon.c b/src/wrapped/wrappedxkbcommon.c
index c0be8c64..5515e0b8 100644
--- a/src/wrapped/wrappedxkbcommon.c
+++ b/src/wrapped/wrappedxkbcommon.c
@@ -12,6 +12,8 @@
 #include "x64emu.h"
 
 const char* xkbcommonName = "libxkbcommon.so.0";
+#define ALTNAME "libxkbcommon.so"
+
 #define LIBNAME xkbcommon
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedxkbcommonx11.c b/src/wrapped/wrappedxkbcommonx11.c
index 04f945e2..81c8e5be 100644
--- a/src/wrapped/wrappedxkbcommonx11.c
+++ b/src/wrapped/wrappedxkbcommonx11.c
@@ -12,6 +12,8 @@
 #include "x64emu.h"
 
 const char* xkbcommonx11Name = "libxkbcommon-x11.so.0";
+#define ALTNAME "libxkbcommon-x11.so"
+
 #define LIBNAME xkbcommonx11
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedxkbregistry.c b/src/wrapped/wrappedxkbregistry.c
index 437b8a84..94287fbf 100644
--- a/src/wrapped/wrappedxkbregistry.c
+++ b/src/wrapped/wrappedxkbregistry.c
@@ -12,6 +12,8 @@
 #include "x64emu.h"
 
 const char* xkbregistryName = "libxkbregistry.so.0";
+#define ALTNAME "libxkbregistry.so"
+
 #define LIBNAME xkbregistry
 
 #include "wrappedlib_init.h"
diff --git a/src/wrapped/wrappedxml2.c b/src/wrapped/wrappedxml2.c
index 1c352c6b..8c52e0b0 100644
--- a/src/wrapped/wrappedxml2.c
+++ b/src/wrapped/wrappedxml2.c
@@ -18,13 +18,9 @@
 #include "callback.h"
 #include "myalign.h"
 
-const char* xml2Name =
-#ifdef ANDROID
-    "libxml2.so"
-#else
-    "libxml2.so.2"
-#endif
-    ;
+const char* xml2Name = "libxml2.so.2";
+#define ALTNAME "libxml2.so"
+
 #define LIBNAME xml2
 
 
diff --git a/src/wrapped/wrappedxshmfence.c b/src/wrapped/wrappedxshmfence.c
index e6f83b84..91c4e20d 100644
--- a/src/wrapped/wrappedxshmfence.c
+++ b/src/wrapped/wrappedxshmfence.c
@@ -11,11 +11,8 @@
 #include "librarian/library_private.h"
 #include "x64emu.h"
 
-#ifdef ANDROID
-	const char* xshmfenceName = "libxshmfence.so";
-#else
-	const char* xshmfenceName = "libxshmfence.so.1";
-#endif
+const char* xshmfenceName = "libxshmfence.so.1";
+#define ALTNAME "libxshmfence.so"
 
 #define LIBNAME xshmfence
 
diff --git a/src/wrapped/wrappedxslt.c b/src/wrapped/wrappedxslt.c
index 35bcc751..01cff424 100644
--- a/src/wrapped/wrappedxslt.c
+++ b/src/wrapped/wrappedxslt.c
@@ -17,13 +17,9 @@
 #include "callback.h"
 #include "globalsymbols.h"
 
-const char *xsltName =
-#ifdef ANDROID
-    "libxslt.so"
-#else
-    "libxslt.so.1"
-#endif
-    ;
+const char *xsltName = "libxslt.so.1";
+#define ALTNAME "libxslt.so"
+
 #define LIBNAME xslt
 
 #define ADDED_FUNCTIONS() \