diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 8872841672..218ca4297f 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -402,7 +402,7 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
 
    if (initial && (type == VULKAN_TEXTURE_STREAMED || type == VULKAN_TEXTURE_STAGING))
    {
-      unsigned x, y;
+      unsigned y;
       uint8_t *dst       = NULL;
       const uint8_t *src = NULL;
       void *ptr          = NULL;
@@ -422,7 +422,6 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
    {
       VkImageCopy region;
       VkCommandBuffer staging;
-      unsigned bpp = vulkan_format_to_bpp(tex.format);
       struct vk_texture tmp = vulkan_create_texture(vk, NULL,
             width, height, format, initial, NULL, VULKAN_TEXTURE_STAGING);
 
diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h
index 6bf0d201de..b54ad343fd 100644
--- a/gfx/common/vulkan_common.h
+++ b/gfx/common/vulkan_common.h
@@ -45,7 +45,7 @@
 #include "../../retroarch.h"
 #include "../font_driver.h"
 #include "../video_context_driver.h"
-#include "libretro_vulkan.h"
+#include "../../libretro_vulkan.h"
 #include "../drivers_shader/shader_vulkan.h"
 
 typedef struct vulkan_filter_chain vulkan_filter_chain_t;
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 1952398937..f6681568ec 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -451,8 +451,6 @@ static void vulkan_deinit_buffers(vk_t *vk)
 static void vulkan_init_descriptor_pool(vk_t *vk)
 {
    unsigned i;
-   VkDescriptorPoolCreateInfo pool_info            = { 
-      VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO };
    static const VkDescriptorPoolSize pool_sizes[2] = {
       { VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VULKAN_DESCRIPTOR_MANAGER_BLOCK_SETS },
       { VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, VULKAN_DESCRIPTOR_MANAGER_BLOCK_SETS },
@@ -603,7 +601,6 @@ static bool vulkan_init_default_filter_chain(vk_t *vk)
 static bool vulkan_init_filter_chain_preset(vk_t *vk, const char *shader_path)
 {
    struct vulkan_filter_chain_create_info info;
-   bool ret = true;
 
    memset(&info, 0, sizeof(info));
 
@@ -1357,7 +1354,6 @@ static bool vulkan_frame(void *data, const void *frame,
    unsigned width, height;
    VkClearValue clear_value;
    vk_t *vk                                      = (vk_t*)data;
-   settings_t *settings                          = config_get_ptr();
    static struct retro_perf_counter frame_run    = {0};
    static struct retro_perf_counter copy_frame   = {0};
    static struct retro_perf_counter swapbuffers  = {0};
@@ -1799,7 +1795,7 @@ static void vulkan_set_texture_frame(void *data,
       const void *frame, bool rgb32, unsigned width, unsigned height,
       float alpha)
 {
-   unsigned x, y, stride;
+   unsigned y, stride;
    uint8_t *ptr                       = NULL;
    uint8_t *dst                       = NULL;
    const uint8_t *src                 = NULL;
@@ -1969,13 +1965,12 @@ static bool vulkan_read_viewport(void *data, uint8_t *buffer)
 
    if (vk->readback.streamed)
    {
+      const uint8_t *src;
+      static struct retro_perf_counter stream_readback = {0};
+
       if (staging->memory == VK_NULL_HANDLE)
          return false;
 
-      const uint8_t *src;
-      unsigned x, y;
-
-      static struct retro_perf_counter stream_readback = {0};
       rarch_perf_init(&stream_readback, "stream_readback");
       retro_perf_start(&stream_readback);
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index b63a0ca396..4acf4926b9 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -236,7 +236,6 @@ VIDEO DRIVER
 
 #ifdef HAVE_VULKAN
 #include "../gfx/drivers/vulkan.c"
-#include "../gfx/common/vulkan_common.c"
 #endif
 
 #ifdef HAVE_OPENGL
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index 41600940fd..7e059baee2 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -141,7 +141,6 @@ static void menu_display_vk_draw_bg(void *data)
    const float *new_vertex       = NULL;
    const float *new_tex_coord    = NULL;
    menu_display_ctx_draw_t *draw = (menu_display_ctx_draw_t*)data;
-   global_t     *global          = global_get_ptr();
    settings_t *settings          = config_get_ptr();
    vk_t             *vk          = vk_get_ptr();
 
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 37bc37a51d..52b2b97ee8 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -5,6 +5,7 @@ RARCH_DIR := ../../../..
 
 HAVE_NEON   := 1
 HAVE_LOGGER := 0
+HAVE_VULKAN := 0
 
 include $(CLEAR_VARS)
 ifeq ($(TARGET_ARCH),arm)
@@ -51,15 +52,24 @@ endif
 
 
 LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
+
+ifeq ($(HAVE_VULKAN),1)
+LOCAL_CFLAGS += -DHAVE_VULKAN
+endif
+
 LOCAL_CFLAGS += -DHAVE_7ZIP
 LOCAL_CFLAGS += -DHAVE_CHEEVOS
 
 # Let ndk-build set the optimization flags but remove -O3 like in cf3c3
 LOCAL_CFLAGS := $(subst -O3,-O2,$(LOCAL_CFLAGS))
 
-LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
+LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
 
+ifeq ($(HAVE_VULKAN),1)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include
+endif
+
 LOCAL_CFLAGS += -DHAVE_SL
 LOCAL_LDLIBS += -lOpenSLES -lz
 
diff --git a/pkg/android/phoenix/jni/Android2.mk b/pkg/android/phoenix/jni/Android2.mk
index 82de5b45f1..39b8094ff9 100644
--- a/pkg/android/phoenix/jni/Android2.mk
+++ b/pkg/android/phoenix/jni/Android2.mk
@@ -5,6 +5,7 @@ RARCH_DIR := ../../../..
 
 HAVE_NEON   := 1
 HAVE_LOGGER := 0
+HAVE_VULKAN := 0
 
 include $(CLEAR_VARS)
 ifeq ($(TARGET_ARCH),arm)
@@ -51,6 +52,11 @@ endif
 
 
 LOCAL_CFLAGS += -Wall -pthread -Wno-unused-function -fno-stack-protector -funroll-loops -DRARCH_MOBILE -DHAVE_GRIFFIN -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_FBO -DHAVE_OVERLAY -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETPLAY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -std=gnu99 -DHAVE_LIBRETRODB -DHAVE_STB_FONT
+
+ifeq ($(HAVE_VULKAN),1)
+LOCAL_CFLAGS += -DHAVE_VULKAN
+endif
+
 LOCAL_CFLAGS += -DHAVE_7ZIP
 LOCAL_CFLAGS += -DHAVE_CHEEVOS
 LOCAL_CFLAGS += -DDEBUG_ANDROID
@@ -64,6 +70,10 @@ endif
 LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
 
+ifeq ($(HAVE_VULKAN),1)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(RARCH_DIR)/gfx/include
+endif
+
 LOCAL_CFLAGS += -DHAVE_SL
 LOCAL_LDLIBS += -lOpenSLES -lz