diff --git a/Makefile.common b/Makefile.common
index 34c0b4a719..9a3ce52525 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1211,7 +1211,7 @@ ifeq ($(HAVE_NETWORKING), 1)
       ifeq ($(HAVE_BUILTINMINIUPNPC), 1)
          DEFINES += -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR
 			DEFINES += -I$(DEPS_DIR)/miniupnpc
-         OBJ += \
+         OBJ     += \
 					 $(DEPS_DIR)/miniupnpc/igd_desc_parse.o \
 					 $(DEPS_DIR)/miniupnpc/upnpreplyparse.o \
 					 $(DEPS_DIR)/miniupnpc/upnpcommands.o \
@@ -1225,6 +1225,7 @@ ifeq ($(HAVE_NETWORKING), 1)
 					 $(DEPS_DIR)/miniupnpc/miniupnpc.o \
 					 $(DEPS_DIR)/miniupnpc/minixml.o \
 					 $(DEPS_DIR)/miniupnpc/minisoap.o
+		endif
 		else
 		   LIBS += -lminiupnpc
       endif
diff --git a/deps/miniupnpc/minissdpc.c b/deps/miniupnpc/minissdpc.c
index 89b9d249ae..5c790e4ca1 100644
--- a/deps/miniupnpc/minissdpc.c
+++ b/deps/miniupnpc/minissdpc.c
@@ -451,8 +451,8 @@ parseMSEARCHReply(const char * reply, int size,
 
 /* port upnp discover : SSDP protocol */
 #define SSDP_PORT 1900
-#define XSTR(s) STR(s)
-#define STR(s) #s
+#define XSTR(s) MINISSDPC_STR(s)
+#define MINISSDPC_STR(s) #s
 #define UPNP_MCAST_ADDR "239.255.255.250"
 /* for IPv6 */
 #define UPNP_MCAST_LL_ADDR "FF02::C" /* link-local */
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 3ab0a22c4d..b1d31b091d 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -64,7 +64,7 @@ else
    DEFINES += -DHAVE_OPENGLES2
 endif
 
-DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER
+DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR
 DEFINES += -DWANT_IFADDRS
 
 ifeq ($(HAVE_VULKAN),1)
@@ -81,7 +81,10 @@ LOCAL_CPPFLAGS := -fexceptions -fpermissive -std=gnu++11 -fno-rtti -Wno-reorder
 LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS))
 
 LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
+LOCAL_C_INCLUDES := \
+							$(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/ \
+							$(LOCAL_PATH)/$(RARCH_DIR)/deps
+
 
 ifeq ($(HAVE_VULKAN),1)
 INCFLAGS         += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include