diff --git a/Makefile.common b/Makefile.common
index 8207a496fe..ab3538335f 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -497,10 +497,10 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
       HAVE_XMB = 1
    endif
 else
-   HAVE_ZARCH = 0
-   HAVE_MATERIALUI  = 0
-   #HAVE_NUKLEAR = 0
-   HAVE_XMB   = 0
+   HAVE_ZARCH ?= 0
+   HAVE_MATERIALUI  ?= 0
+   #HAVE_NUKLEAR ?= 0
+   HAVE_XMB   ?= 0
 endif
 
 ifeq ($(HAVE_RGUI), 1)
@@ -526,12 +526,14 @@ ifeq ($(HAVE_ZARCH), 1)
    OBJ += menu/drivers/zarch.o
    DEFINES += -DHAVE_ZARCH
 endif
+
+endif
+
 ifeq ($(HAVE_XMB), 1)
    OBJ += menu/drivers/xmb.o
    DEFINES += -DHAVE_XMB
    HAVE_MENU_COMMON = 1
 endif
-endif
 
 ifeq ($(HAVE_LAKKA), 1)
    DEFINES += -DHAVE_LAKKA
@@ -579,9 +581,14 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/drivers/null.o
 endif
 
+ifeq ($(HAVE_OVERLAY), 1)
+   DEFINES += -DHAVE_OVERLAY
+endif
+
 ifeq ($(HAVE_STB_FONT), 1)
    OBJ += gfx/drivers_font_renderer/stb.o
    OBJ += gfx/drivers_font_renderer/stb_unicode.o
+   DEFINES += -DHAVE_STB_FONT
 endif
 
 ifeq ($(HAVE_FREETYPE), 1)
diff --git a/Makefile.vita b/Makefile.vita
index 1cbce99a46..9b27cb4b32 100644
--- a/Makefile.vita
+++ b/Makefile.vita
@@ -1,17 +1,13 @@
 TARGET		    := retroarch_vita
-DEBUG                = 0
+DEBUG               ?= 0
 GRIFFIN_BUILD        = 0
 WHOLE_ARCHIVE_LINK   = 0
-HAVE_NETLOGGER       = 0
-HAVE_RGUI				= 1
-HAVE_MATERIALUI		= 1
-HAVE_XMB             = 1
 
 VITA_TITLE_ID	:= RETROARCH
 VITA_TITLE_NAME	:= RetroArch
 
 PC_DEVELOPMENT_IP_ADDRESS  =
-PC_DEVELOPMENT_TCP_PORT	   =
+PC_DEVELOPMENT_UDP_PORT	   =
 
 OBJ :=
 
@@ -19,8 +15,12 @@ DEFINES :=
 
 ifeq ($(GRIFFIN_BUILD), 1)
 	OBJ += griffin/griffin.o
-	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB
+	DEFINES += -DHAVE_GRIFFIN=1
+	DEFINES += -DHAVE_NEON -DHAVE_MENU -DHAVE_XMB -DHAVE_MATERIALUI -DHAVE_LIBRETRODB
 	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
+	ifeq ($(DEBUG), 1)
+		DEFINES += -DHAVE_NETLOGGER
+	endif
 else
 
 	HAVE_NEON		:= 1
@@ -35,19 +35,24 @@ else
 	HAVE_VITA2D		:= 1
 	HAVE_NETWORKING		:= 1
 	HAVE_SOCKET_LEGACY	:= 1
-	HAVE_OVERLAY		:= 1
 	HAVE_MENU		:= 1
+	HAVE_MENU_COMMON	:= 1
+	HAVE_OVERLAY		:= 1
 	HAVE_MATERIALUI		:= 1
 	HAVE_XMB		:= 1
+	HAVE_RGUI		:= 1
 	HAVE_STB_FONT		:= 1
 	HAVE_THREADS		:= 1
 	HAVE_LIBRETRODB		:= 1
+	HAVE_CC_RESAMPLER	:= 1
 	RARCH_CONSOLE		:= 1
 
+	ifeq ($(DEBUG), 1)
+		HAVE_NETLOGGER = 1
+	endif
+
 	include Makefile.common
 	BLACKLIST :=
-	BLACKLIST += input/input_overlay.o
-	BLACKLIST += tasks/task_overlay.o
 	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 
 	OBJ += input/drivers/psp_input.o
@@ -79,7 +84,7 @@ ifeq ($(strip $(VITASDK)),)
 $(error "Please set VITASDK in your environment. export VITASDK=<path to>vitasdk")
 endif
 
-export PATH	  := $(PATH):$(VITASDK)/bin
+export PATH := $(PATH):$(VITASDK)/bin
 
 PREFIX := arm-vita-eabi-
 
@@ -96,16 +101,16 @@ INCDIRS := -I. -Ideps/zlib -Ideps/7zip -Ilibretro-common/include
 LIBDIRS := -L.
 
 ARCHFLAGS := -march=armv7-a -mfpu=neon -mfloat-abi=hard -DVITA
-CFLAGS    += $(ARCHFLAGS) -Wl,-q -mword-relocations -fno-optimize-sibling-calls
+CFLAGS    += $(ARCHFLAGS) -mword-relocations -fno-optimize-sibling-calls
 
 ifeq ($(DEBUG), 1)
-   CFLAGS += -O0 -g
+   CFLAGS += -O2 -g
 else
    CFLAGS += -O3
 endif
-LDFLAGS := $(CFLAGS)
 
 ASFLAGS := $(CFLAGS)
+LDFLAGS := -Wl,-q
 
 CFLAGS += -Wall -ffast-math
 CFLAGS += -DRARCH_INTERNAL -DRARCH_CONSOLE
@@ -115,8 +120,8 @@ ifneq ($(PC_DEVELOPMENT_IP_ADDRESS),)
    CFLAGS += -DPC_DEVELOPMENT_IP_ADDRESS='"$(PC_DEVELOPMENT_IP_ADDRESS)"'
 endif
 
-ifneq ($(PC_DEVELOPMENT_TCP_PORT),)
-   CFLAGS += -DPC_DEVELOPMENT_TCP_PORT=$(PC_DEVELOPMENT_TCP_PORT)
+ifneq ($(PC_DEVELOPMENT_UDP_PORT),)
+   CFLAGS += -DPC_DEVELOPMENT_UDP_PORT=$(PC_DEVELOPMENT_UDP_PORT)
 endif
 
 ifeq ($(WHOLE_ARCHIVE_LINK), 1)