diff --git a/Makefile.griffin b/Makefile.griffin
index 5a513f5968..02d2ef3663 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -208,12 +208,20 @@ else ifeq ($(platform), vita)
   EXT_TARGET := $(TARGET_NAME)_$(platform).velf
   EXT_INTER_TARGET := $(TARGET_NAME)_$(platform).elf
   MACHDEP := -DVITA
+  INCLUDE += -I$(VITASDK)/arm-vita-eabi/include/freetype2 -Ideps/libvita2d/include
   PLATCFLAGS :=  -O3 -mfloat-abi=hard -ffast-math -fsingle-precision-constant
   LIBS += -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub -lSceNet_stub -lSceNetCtl_stub\
 			 -lSceSysmodule_stub -lSceCtrl_stub -lSceAudio_stub \
 			 -lScePower_stub -lSceRtc_stub -lSceCommonDialog_stub -lfreetype -lz -lm -lc -lpng
 
-  PLATOBJS += libretro-common/conversion/s16_to_float_neon.o \
+  PLATOBJS += deps/libvita2d/shader/compiled/clear_v_gxp.o \
+				  deps/libvita2d/shader/compiled/clear_f_gxp.o \
+				  deps/libvita2d/shader/compiled/color_v_gxp.o \
+				  deps/libvita2d/shader/compiled/color_f_gxp.o \
+				  deps/libvita2d/shader/compiled/texture_v_gxp.o \
+				  deps/libvita2d/shader/compiled/texture_f_gxp.o \
+				  deps/libvita2d/shader/compiled/texture_tint_f_gxp.o\
+				  libretro-common/conversion/s16_to_float_neon.o \
 				  audio/drivers_resampler/sinc_resampler_neon.o \
               audio/drivers_resampler/cc_resampler_neon.o
 
@@ -266,7 +274,7 @@ CFLAGS		+= -DHAVE_WIIUSB_HID -DHAVE_HID
 endif
 
 ifeq ($(HAVE_VITA2D), 1)
-CFLAGS		+= -DHAVE_VITA2D
+CFLAGS		+= -DHAVE_VITA2D -
 endif
 
 ifeq ($(HAVE_LIBRETRODB), 1)
@@ -354,10 +362,6 @@ LIBS += -lpthread-psp
 endif
 endif
 
-ifeq ($(HAVE_VITA2D), 1)
-LIBS := -lvita2d $(LIBS)
-endif
-
 ifeq ($(HAVE_RSOUND), 1)
 CFLAGS += -DHAVE_RSOUND
 endif
diff --git a/deps/libvita2d/libvita2d/Makefile b/deps/libvita2d/Makefile
similarity index 100%
rename from deps/libvita2d/libvita2d/Makefile
rename to deps/libvita2d/Makefile
diff --git a/deps/libvita2d/libvita2d/include/bin_packing_2d.h b/deps/libvita2d/include/bin_packing_2d.h
similarity index 100%
rename from deps/libvita2d/libvita2d/include/bin_packing_2d.h
rename to deps/libvita2d/include/bin_packing_2d.h
diff --git a/deps/libvita2d/libvita2d/include/int_htab.h b/deps/libvita2d/include/int_htab.h
similarity index 100%
rename from deps/libvita2d/libvita2d/include/int_htab.h
rename to deps/libvita2d/include/int_htab.h
diff --git a/deps/libvita2d/libvita2d/include/shared.h b/deps/libvita2d/include/shared.h
similarity index 100%
rename from deps/libvita2d/libvita2d/include/shared.h
rename to deps/libvita2d/include/shared.h
diff --git a/deps/libvita2d/libvita2d/include/texture_atlas.h b/deps/libvita2d/include/texture_atlas.h
similarity index 100%
rename from deps/libvita2d/libvita2d/include/texture_atlas.h
rename to deps/libvita2d/include/texture_atlas.h
diff --git a/deps/libvita2d/libvita2d/include/utils.h b/deps/libvita2d/include/utils.h
similarity index 100%
rename from deps/libvita2d/libvita2d/include/utils.h
rename to deps/libvita2d/include/utils.h
diff --git a/deps/libvita2d/libvita2d/include/vita2d.h b/deps/libvita2d/include/vita2d.h
similarity index 100%
rename from deps/libvita2d/libvita2d/include/vita2d.h
rename to deps/libvita2d/include/vita2d.h
diff --git a/deps/libvita2d/libvita2d/source/.vita2d.c.swp b/deps/libvita2d/libvita2d/source/.vita2d.c.swp
deleted file mode 100644
index 97d6f9aa73..0000000000
Binary files a/deps/libvita2d/libvita2d/source/.vita2d.c.swp and /dev/null differ
diff --git a/deps/libvita2d/libvita2d/shader/clear_f.cg b/deps/libvita2d/shader/clear_f.cg
similarity index 100%
rename from deps/libvita2d/libvita2d/shader/clear_f.cg
rename to deps/libvita2d/shader/clear_f.cg
diff --git a/deps/libvita2d/libvita2d/shader/clear_v.cg b/deps/libvita2d/shader/clear_v.cg
similarity index 100%
rename from deps/libvita2d/libvita2d/shader/clear_v.cg
rename to deps/libvita2d/shader/clear_v.cg
diff --git a/deps/libvita2d/libvita2d/shader/color_f.cg b/deps/libvita2d/shader/color_f.cg
similarity index 100%
rename from deps/libvita2d/libvita2d/shader/color_f.cg
rename to deps/libvita2d/shader/color_f.cg
diff --git a/deps/libvita2d/libvita2d/shader/color_v.cg b/deps/libvita2d/shader/color_v.cg
similarity index 100%
rename from deps/libvita2d/libvita2d/shader/color_v.cg
rename to deps/libvita2d/shader/color_v.cg
diff --git a/deps/libvita2d/libvita2d/shader/texture_f.cg b/deps/libvita2d/shader/texture_f.cg
similarity index 100%
rename from deps/libvita2d/libvita2d/shader/texture_f.cg
rename to deps/libvita2d/shader/texture_f.cg
diff --git a/deps/libvita2d/libvita2d/shader/texture_tint_f.cg b/deps/libvita2d/shader/texture_tint_f.cg
similarity index 100%
rename from deps/libvita2d/libvita2d/shader/texture_tint_f.cg
rename to deps/libvita2d/shader/texture_tint_f.cg
diff --git a/deps/libvita2d/libvita2d/shader/texture_v.cg b/deps/libvita2d/shader/texture_v.cg
similarity index 100%
rename from deps/libvita2d/libvita2d/shader/texture_v.cg
rename to deps/libvita2d/shader/texture_v.cg
diff --git a/deps/libvita2d/libvita2d/source/bin_packing_2d.c b/deps/libvita2d/source/bin_packing_2d.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/bin_packing_2d.c
rename to deps/libvita2d/source/bin_packing_2d.c
diff --git a/deps/libvita2d/libvita2d/source/int_htab.c b/deps/libvita2d/source/int_htab.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/int_htab.c
rename to deps/libvita2d/source/int_htab.c
diff --git a/deps/libvita2d/libvita2d/source/texture_atlas.c b/deps/libvita2d/source/texture_atlas.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/texture_atlas.c
rename to deps/libvita2d/source/texture_atlas.c
diff --git a/deps/libvita2d/libvita2d/source/utils.c b/deps/libvita2d/source/utils.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/utils.c
rename to deps/libvita2d/source/utils.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d.c b/deps/libvita2d/source/vita2d.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d.c
rename to deps/libvita2d/source/vita2d.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d_draw.c b/deps/libvita2d/source/vita2d_draw.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d_draw.c
rename to deps/libvita2d/source/vita2d_draw.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d_font.c b/deps/libvita2d/source/vita2d_font.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d_font.c
rename to deps/libvita2d/source/vita2d_font.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d_image_bmp.c b/deps/libvita2d/source/vita2d_image_bmp.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d_image_bmp.c
rename to deps/libvita2d/source/vita2d_image_bmp.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d_image_jpeg.c b/deps/libvita2d/source/vita2d_image_jpeg.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d_image_jpeg.c
rename to deps/libvita2d/source/vita2d_image_jpeg.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d_image_png.c b/deps/libvita2d/source/vita2d_image_png.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d_image_png.c
rename to deps/libvita2d/source/vita2d_image_png.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d_pgf.c b/deps/libvita2d/source/vita2d_pgf.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d_pgf.c
rename to deps/libvita2d/source/vita2d_pgf.c
diff --git a/deps/libvita2d/libvita2d/source/vita2d_texture.c b/deps/libvita2d/source/vita2d_texture.c
similarity index 100%
rename from deps/libvita2d/libvita2d/source/vita2d_texture.c
rename to deps/libvita2d/source/vita2d_texture.c
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 84d073f256..d5767b725b 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -314,6 +314,19 @@ VIDEO DRIVER
 #elif defined(PSP)
 #include "../gfx/drivers/psp1_gfx.c"
 #elif defined(HAVE_VITA2D)
+#include "../deps/libvita2d/source/vita2d.c"
+#include "../deps/libvita2d/source/vita2d_texture.c"
+#include "../deps/libvita2d/source/vita2d_draw.c"
+#include "../deps/libvita2d/source/utils.c"
+#include "../deps/libvita2d/source/vita2d_image_png.c"
+#include "../deps/libvita2d/source/vita2d_image_jpeg.c"
+#include "../deps/libvita2d/source/vita2d_image_bmp.c"
+#include "../deps/libvita2d/source/vita2d_font.c"
+#include "../deps/libvita2d/source/vita2d_pgf.c"
+#include "../deps/libvita2d/source/bin_packing_2d.c"
+#include "../deps/libvita2d/source/texture_atlas.c"
+#include "../deps/libvita2d/source/int_htab.c"
+
 #include "../gfx/drivers/vita2d_gfx.c"
 #elif defined(_3DS)
 #include "../gfx/drivers/ctr_gfx.c"