diff --git a/deps/miniupnpc/portlistingparse.c b/deps/miniupnpc/portlistingparse.c
index 55859f2714..722fed2bc7 100644
--- a/deps/miniupnpc/portlistingparse.c
+++ b/deps/miniupnpc/portlistingparse.c
@@ -90,8 +90,7 @@ endelt(void * d, const char * name, int l)
 }
 
 /* Data handler */
-static void
-data(void * d, const char * data, int l)
+static void portlisting_data(void * d, const char * data, int l)
 {
 	struct PortMapping * pm;
 	struct PortMappingParserData * pdata = (struct PortMappingParserData *)d;
@@ -148,13 +147,13 @@ ParsePortListing(const char * buffer, int bufsize,
 
 	memset(pdata, 0, sizeof(struct PortMappingParserData));
 	/* init xmlparser */
-	parser.xmlstart = buffer;
-	parser.xmlsize = bufsize;
-	parser.data = pdata;
+	parser.xmlstart     = buffer;
+	parser.xmlsize      = bufsize;
+	parser.data         = pdata;
 	parser.starteltfunc = startelt;
-	parser.endeltfunc = endelt;
-	parser.datafunc = data;
-	parser.attfunc = 0;
+	parser.endeltfunc   = endelt;
+	parser.datafunc     = portlisting_data;
+	parser.attfunc      = 0;
 	parsexml(&parser);
 }
 
diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj
index 6c132dda97..4a8092a463 100644
--- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj
@@ -377,6 +377,7 @@
 					"$(SRCROOT)/../..",
 					"$(SRCROOT)/../../gfx/include",
 					"$(SRCROOT)/../../libretro-common/include",
+                                        "$(SRCROOT)/../../deps",
 				);
 				INFOPLIST_FILE = OSX/Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -406,6 +407,7 @@
 					"$(SRCROOT)/../..",
 					"$(SRCROOT)/../../gfx/include",
 					"$(SRCROOT)/../../libretro-common/include",
+                                        "$(SRCROOT)/../../deps",
 				);
 				INFOPLIST_FILE = OSX/Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -437,6 +439,7 @@
 					"$(SRCROOT)/../..",
 					"$(SRCROOT)/../../gfx/include",
 					"$(SRCROOT)/../../libretro-common/include",
+                                        "$(SRCROOT)/../../deps",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -462,6 +465,7 @@
 					"$(SRCROOT)/../..",
 					"$(SRCROOT)/../../gfx/include",
 					"$(SRCROOT)/../../libretro-common/include",
+                                        "$(SRCROOT)/../../deps",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -482,6 +486,8 @@
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = (
 					"-DHAVE_GRIFFIN",
+					"-DHAVE_MINIUPNPC",
+					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
 					"-DHAVE_LANGEXTRA",
 					"-DHAVE_CHEEVOS",
@@ -537,6 +543,8 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				OTHER_CFLAGS = (
 					"-DHAVE_GRIFFIN",
+					"-DHAVE_MINIUPNPC",
+					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
 					"-DHAVE_LANGEXTRA",
 					"-DHAVE_CHEEVOS",